diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.cpp b/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.cpp
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.cpp
+++ b/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.cpp
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.h b/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/CHIPClientCallbacks.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.h b/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.mm b/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.mm
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.mm
+++ b/examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.mm
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp
index 66293b68f21e5d..756a665efc6837 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp
+++ b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,75 +47,73 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t percentOpen;
-            bool percentOpenExists      = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (percentOpenExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(percentOpen);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        percentOpenExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t percentOpen;
+bool percentOpenExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (percentOpenExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: {
+      }
+      TLVUnpackError = dataTlv.Get(percentOpen);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            percentOpenExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfBarrierControlClusterBarrierControlStopCallback();
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
+        case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfBarrierControlClusterBarrierControlStopCallback();
+                    break;
+        }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
@@ -126,7 +124,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace BarrierControl
+}
 
 namespace Basic {
 
@@ -145,7 +143,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Basic
+}
 
 namespace Binding {
 
@@ -155,227 +153,223 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_BIND_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::NodeId nodeId;
-            bool nodeIdExists = false;
-            chip::GroupId groupId;
-            bool groupIdExists = false;
-            chip::EndpointId endpointId;
-            bool endpointIdExists = false;
-            chip::ClusterId clusterId;
-            bool clusterIdExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (nodeIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(nodeId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        nodeIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (endpointIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endpointId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endpointIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (clusterIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(clusterId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        clusterIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfBindingClusterBindCallback(nodeId, groupId, endpointId, clusterId);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::NodeId nodeId;
+bool nodeIdExists = false;
+chip::GroupId groupId;
+bool groupIdExists = false;
+chip::EndpointId endpointId;
+bool endpointIdExists = false;
+chip::ClusterId clusterId;
+bool clusterIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (nodeIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(nodeId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            nodeIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (endpointIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endpointId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endpointIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (clusterIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(clusterId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            clusterIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfBindingClusterBindCallback(nodeId, groupId, endpointId, clusterId);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_UNBIND_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::NodeId nodeId;
-            bool nodeIdExists = false;
-            chip::GroupId groupId;
-            bool groupIdExists = false;
-            chip::EndpointId endpointId;
-            bool endpointIdExists = false;
-            chip::ClusterId clusterId;
-            bool clusterIdExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (nodeIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(nodeId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        nodeIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (endpointIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endpointId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endpointIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (clusterIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(clusterId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        clusterIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfBindingClusterUnbindCallback(nodeId, groupId, endpointId, clusterId);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::NodeId nodeId;
+bool nodeIdExists = false;
+chip::GroupId groupId;
+bool groupIdExists = false;
+chip::EndpointId endpointId;
+bool endpointIdExists = false;
+chip::ClusterId clusterId;
+bool clusterIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (nodeIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(nodeId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            nodeIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (endpointIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endpointId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endpointIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (clusterIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(clusterId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            clusterIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfBindingClusterUnbindCallback(nodeId, groupId, endpointId, clusterId);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         default: {
@@ -388,7 +382,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Binding
+}
 
 namespace ColorControl {
 
@@ -398,5971 +392,5845 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_MOVE_COLOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            int16_t rateX;
-            bool rateXExists = false;
-            int16_t rateY;
-            bool rateYExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (rateXExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rateX);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateXExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateYExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rateY);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateYExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+int16_t rateX;
+bool rateXExists = false;
+int16_t rateY;
+bool rateYExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (rateXExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint16_t rate;
-            bool rateExists = false;
-            uint16_t colorTemperatureMinimum;
-            bool colorTemperatureMinimumExists = false;
-            uint16_t colorTemperatureMaximum;
-            bool colorTemperatureMaximumExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (colorTemperatureMinimumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMinimumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (colorTemperatureMaximumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMaximumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum,
-                                                                       colorTemperatureMaximum, optionsMask, optionsOverride);
-            }
-            else if (6 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(rateX);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateXExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateYExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_HUE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(rateY);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateYExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
         }
-        case ZCL_MOVE_TO_COLOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t colorX;
-            bool colorXExists = false;
-            uint16_t colorY;
-            bool colorYExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (colorXExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorX);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorXExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (colorYExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorY);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorYExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t colorTemperature;
-            bool colorTemperatureExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (colorTemperatureExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperature);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask,
-                                                                         optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint16_t rate;
+bool rateExists = false;
+uint16_t colorTemperatureMinimum;
+bool colorTemperatureMinimumExists = false;
+uint16_t colorTemperatureMaximum;
+bool colorTemperatureMaximumExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_TO_HUE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t hue;
-            bool hueExists = false;
-            uint8_t direction;
-            bool directionExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (hueExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(hue);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        hueExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (directionExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(direction);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        directionExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t hue;
-            bool hueExists = false;
-            uint8_t saturation;
-            bool saturationExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (hueExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(hue);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        hueExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (saturationExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(saturation);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        saturationExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask,
-                                                                         optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (colorTemperatureMinimumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_TO_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t saturation;
-            bool saturationExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (saturationExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(saturation);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        saturationExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMinimumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (colorTemperatureMaximumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STEP_COLOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            int16_t stepX;
-            bool stepXExists = false;
-            int16_t stepY;
-            bool stepYExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepXExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepX);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepXExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepYExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepY);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepYExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMaximumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint16_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint16_t colorTemperatureMinimum;
-            bool colorTemperatureMinimumExists = false;
-            uint16_t colorTemperatureMaximum;
-            bool colorTemperatureMaximumExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (colorTemperatureMinimumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMinimumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (colorTemperatureMaximumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMaximumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum,
-                                                                       colorTemperatureMaximum, optionsMask, optionsOverride);
-            }
-            else if (7 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
         }
-        case ZCL_STEP_HUE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint8_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+else if (6 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6, validArgumentCount);
+}
             break;
         }
-        case ZCL_STEP_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint8_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_HUE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STOP_MOVE_STEP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_COLOR_CONTROL_CLUSTER_ID);
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        }
-    }
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace ColorControl
-
-namespace DoorLock {
-
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+if (CHIP_END_OF_TLV == TLVError)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_CLEAR_ALL_PINS_COMMAND_ID: {
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfDoorLockClusterClearAllPinsCallback();
-            break;
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
         }
-        case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfDoorLockClusterClearAllRfidsCallback();
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists       = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_CLEAR_PIN_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearPinCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_CLEAR_RFID_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_COLOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t colorX;
+bool colorXExists = false;
+uint16_t colorY;
+bool colorYExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (colorXExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(colorX);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorXExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (colorYExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(colorY);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorYExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t colorTemperature;
+bool colorTemperatureExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (colorTemperatureExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperature);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, optionsOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_HUE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t hue;
+bool hueExists = false;
+uint8_t direction;
+bool directionExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (hueExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(hue);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            hueExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (directionExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(direction);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            directionExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t hue;
+bool hueExists = false;
+uint8_t saturation;
+bool saturationExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (hueExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(hue);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            hueExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (saturationExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(saturation);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            saturationExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, optionsOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t saturation;
+bool saturationExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (saturationExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(saturation);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            saturationExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STEP_COLOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+int16_t stepX;
+bool stepXExists = false;
+int16_t stepY;
+bool stepYExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepXExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepX);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepXExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepYExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepY);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepYExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint16_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint16_t colorTemperatureMinimum;
+bool colorTemperatureMinimumExists = false;
+uint16_t colorTemperatureMaximum;
+bool colorTemperatureMaximumExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (colorTemperatureMinimumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMinimumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (colorTemperatureMaximumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMaximumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+        }
+else if (7 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STEP_HUE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint8_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STEP_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint8_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STOP_MOVE_STEP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_COLOR_CONTROL_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace DoorLock {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_CLEAR_ALL_PINS_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllPinsCallback();
                     break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+        }
+        case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllRfidsCallback();
                     break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearRfidCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        }
+        case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_PIN_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearPinCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_RFID_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearRfidCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_LOG_RECORD_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t logIndex;
+bool logIndexExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (logIndexExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(logIndex);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            logIndexExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetLogRecordCallback(logIndex);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_PIN_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetPinCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_RFID_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetRfidCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_USER_TYPE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetUserTypeCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_LOCK_DOOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+const uint8_t * PIN;
+bool PINExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (PINExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(PIN);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            PINExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterLockDoorCallback(const_cast<uint8_t*>(PIN));
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint8_t operatingModeDuringHoliday;
+bool operatingModeDuringHolidayExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (operatingModeDuringHolidayExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operatingModeDuringHolidayExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_PIN_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, const_cast<uint8_t*>(pin));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_RFID_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * id;
+bool idExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (idExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(id);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            idExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, const_cast<uint8_t*>(id));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_USER_TYPE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
-        case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t daysMask;
+bool daysMaskExists = false;
+uint8_t startHour;
+bool startHourExists = false;
+uint8_t startMinute;
+bool startMinuteExists = false;
+uint8_t endHour;
+bool endHourExists = false;
+uint8_t endMinute;
+bool endMinuteExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (daysMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(daysMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            daysMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (startHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (startMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (endHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (endMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(endMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
         }
-        case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+else if (7 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists       = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
         }
-        case ZCL_GET_LOG_RECORD_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t logIndex;
-            bool logIndexExists         = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (logIndexExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(logIndex);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        logIndexExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetLogRecordCallback(logIndex);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_PIN_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetPinCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_UNLOCK_DOOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+const uint8_t * PIN;
+bool PINExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (PINExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(PIN);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            PINExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockDoorCallback(const_cast<uint8_t*>(PIN));
         }
-        case ZCL_GET_RFID_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t timeoutInSeconds;
+bool timeoutInSecondsExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutInSecondsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutInSeconds);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutInSecondsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, const_cast<uint8_t*>(pin));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_DOOR_LOCK_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace GeneralCommissioning {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_ARM_FAIL_SAFE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t expiryLengthSeconds;
+bool expiryLengthSecondsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (expiryLengthSecondsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(expiryLengthSeconds);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            expiryLengthSecondsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterArmFailSafeCallback(expiryLengthSeconds, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_COMMISSIONING_COMPLETE_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterCommissioningCompleteCallback();
                     break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+        }
+        case ZCL_SET_FABRIC_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan fabricId;
+bool fabricIdExists = false;
+chip::ByteSpan fabricSecret;
+bool fabricSecretExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (fabricIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        fabricId = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            fabricIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (fabricSecretExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        fabricSecret = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            fabricSecretExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterSetFabricCallback(fabricId, fabricSecret, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace Groups {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_ADD_GROUP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+const uint8_t * groupName;
+bool groupNameExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(groupName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterAddGroupCallback(groupId, const_cast<uint8_t*>(groupName));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+const uint8_t * groupName;
+bool groupNameExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(groupName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, const_cast<uint8_t*>(groupName));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t groupCount;
+bool groupCountExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
+bool groupListExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupCountExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupCount);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupCountExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupListExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupListExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterRemoveAllGroupsCallback();
                     break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetRfidCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        }
+        case ZCL_REMOVE_GROUP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterRemoveGroupCallback(groupId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_USER_TYPE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetUserTypeCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_VIEW_GROUP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterViewGroupCallback(groupId);
         }
-        case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_GROUPS_CLUSTER_ID);
             break;
         }
-        case ZCL_LOCK_DOOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            const uint8_t * PIN;
-            bool PINExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (PINExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(PIN);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        PINExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterLockDoorCallback(const_cast<uint8_t *>(PIN));
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
-            break;
         }
-        case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists = false;
-            uint8_t operatingModeDuringHoliday;
-            bool operatingModeDuringHolidayExists = false;
-            uint32_t validArgumentCount           = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (operatingModeDuringHolidayExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operatingModeDuringHolidayExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime,
-                                                                 operatingModeDuringHoliday);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+    }
+}
+
+}
+
+namespace IasZone {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t enrollResponseCode;
+bool enrollResponseCodeExists = false;
+uint8_t zoneId;
+bool zoneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (enrollResponseCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_SET_PIN_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, const_cast<uint8_t *>(pin));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(enrollResponseCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            enrollResponseCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (zoneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(zoneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            zoneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
         }
-        case ZCL_SET_RFID_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * id;
-            bool idExists               = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (idExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(id);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        idExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, const_cast<uint8_t *>(id));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
-        case ZCL_SET_USER_TYPE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userType;
-            bool userTypeExists         = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IAS_ZONE_CLUSTER_ID);
             break;
         }
-        case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t daysMask;
-            bool daysMaskExists = false;
-            uint8_t startHour;
-            bool startHourExists = false;
-            uint8_t startMinute;
-            bool startMinuteExists = false;
-            uint8_t endHour;
-            bool endHourExists = false;
-            uint8_t endMinute;
-            bool endMinuteExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (daysMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(daysMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        daysMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (startHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (startMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (endHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (endMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour,
-                                                                 endMinute);
-            }
-            else if (7 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7,
-                                validArgumentCount);
-            }
-            break;
         }
-        case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists     = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+    }
+}
+
+}
+
+namespace Identify {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_IDENTIFY_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t identifyTime;
+bool identifyTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (identifyTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(identifyTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            identifyTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIdentifyClusterIdentifyCallback(identifyTime);
         }
-        case ZCL_UNLOCK_DOOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            const uint8_t * PIN;
-            bool PINExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (PINExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(PIN);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        PINExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockDoorCallback(const_cast<uint8_t *>(PIN));
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
-        case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t timeoutInSeconds;
-            bool timeoutInSecondsExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutInSecondsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutInSeconds);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutInSecondsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+        case ZCL_IDENTIFY_QUERY_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIdentifyClusterIdentifyQueryCallback();
                     break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, const_cast<uint8_t *>(pin));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
-            break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_DOOR_LOCK_CLUSTER_ID);
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IDENTIFY_CLUSTER_ID);
             break;
         }
         }
     }
 }
 
-} // namespace DoorLock
+}
 
-namespace GeneralCommissioning {
+namespace LevelControl {
 
 void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
 {
     {
         switch (commandId)
         {
-        case ZCL_ARM_FAIL_SAFE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t expiryLengthSeconds;
-            bool expiryLengthSecondsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (expiryLengthSecondsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(expiryLengthSeconds);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        expiryLengthSecondsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterArmFailSafeCallback(expiryLengthSeconds, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
         }
-        case ZCL_COMMISSIONING_COMPLETE_COMMAND_ID: {
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfGeneralCommissioningClusterCommissioningCompleteCallback();
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
-        case ZCL_SET_FABRIC_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan fabricId;
-            bool fabricIdExists = false;
-            chip::ByteSpan fabricSecret;
-            bool fabricSecretExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (fabricIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        fabricId             = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        fabricIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (fabricSecretExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        fabricSecret         = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        fabricSecretExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterSetFabricCallback(fabricId, fabricSecret, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_GENERAL_COMMISSIONING_CLUSTER_ID);
+        case ZCL_STEP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
         }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
         }
-    }
+        case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace GeneralCommissioning
-
-namespace Groups {
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_ADD_GROUP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            const uint8_t * groupName;
-            bool groupNameExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(groupName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterAddGroupCallback(groupId, const_cast<uint8_t *>(groupName));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
-            break;
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
         }
-        case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            const uint8_t * groupName;
-            bool groupNameExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(groupName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, const_cast<uint8_t *>(groupName));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t groupCount;
-            bool groupCountExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
-            bool groupListExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupCountExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupCount);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupCountExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupListExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupListExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_STOP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfGroupsClusterRemoveAllGroupsCallback();
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
         }
-        case ZCL_REMOVE_GROUP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterRemoveGroupCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
-        case ZCL_VIEW_GROUP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopWithOnOffCallback();
                     break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterViewGroupCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
-            break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_GROUPS_CLUSTER_ID);
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LEVEL_CONTROL_CLUSTER_ID);
             break;
         }
         }
     }
 }
 
-} // namespace Groups
+}
 
-namespace IasZone {
+namespace LowPower {
 
 void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
 {
     {
         switch (commandId)
         {
-        case ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t enrollResponseCode;
-            bool enrollResponseCodeExists = false;
-            uint8_t zoneId;
-            bool zoneIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (enrollResponseCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(enrollResponseCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        enrollResponseCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (zoneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(zoneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        zoneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+        case ZCL_SLEEP_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLowPowerClusterSleepCallback();
                     break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
-            break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IAS_ZONE_CLUSTER_ID);
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LOW_POWER_CLUSTER_ID);
             break;
         }
         }
     }
 }
 
-} // namespace IasZone
+}
 
-namespace Identify {
+namespace NetworkCommissioning {
 
 void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
 {
     {
         switch (commandId)
         {
-        case ZCL_IDENTIFY_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t identifyTime;
-            bool identifyTimeExists     = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (identifyTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(identifyTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        identifyTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfIdentifyClusterIdentifyCallback(identifyTime);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_IDENTIFY_QUERY_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfIdentifyClusterIdentifyQueryCallback();
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IDENTIFY_CLUSTER_ID);
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
         }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
+            break;
         }
+        case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
     }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace Identify
-
-namespace LevelControl {
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_MOVE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
-            break;
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
         }
-        case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_DISABLE_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists             = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STEP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
         }
-        case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_STOP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_ENABLE_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfLevelControlClusterStopWithOnOffCallback();
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LEVEL_CONTROL_CLUSTER_ID);
+        case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
         }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
         }
+        case ZCL_REMOVE_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan NetworkID;
+bool NetworkIDExists = false;
+uint64_t Breadcrumb;
+bool BreadcrumbExists = false;
+uint32_t TimeoutMs;
+bool TimeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (NetworkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        NetworkID = chip::ByteSpan(data, dataTlv.GetLength());
     }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            NetworkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (BreadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(Breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            BreadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (TimeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(TimeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            TimeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace LevelControl
-
-namespace LowPower {
-
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+if (CHIP_END_OF_TLV == TLVError)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_SLEEP_COMMAND_ID: {
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfLowPowerClusterSleepCallback();
-            break;
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
         }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LOW_POWER_CLUSTER_ID);
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        }
+        case ZCL_SCAN_NETWORKS_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
     }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace LowPower
-
-namespace NetworkCommissioning {
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
-            break;
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
         }
-        case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
         }
-        case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan NetworkID;
-            bool NetworkIDExists = false;
-            uint64_t Breadcrumb;
-            bool BreadcrumbExists = false;
-            uint32_t TimeoutMs;
-            bool TimeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (NetworkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        NetworkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        NetworkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (BreadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(Breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        BreadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (TimeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(TimeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        TimeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
         }
-        case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         default: {
@@ -6375,7 +6243,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace NetworkCommissioning
+}
 
 namespace OnOff {
 
@@ -6385,22 +6253,22 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOffCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOffCallback();
+                    break;
         }
         case ZCL_ON_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOnCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOnCallback();
+                    break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterToggleCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterToggleCallback();
+                    break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
@@ -6412,7 +6280,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace OnOff
+}
 
 namespace Scenes {
 
@@ -6422,598 +6290,583 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            const uint8_t * sceneName;
-            bool sceneNameExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-            bool extensionFieldSetsExists = false;
-            uint32_t validArgumentCount   = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (sceneNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(sceneName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (extensionFieldSetsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        extensionFieldSetsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, const_cast<uint8_t *>(sceneName),
-                                                     extensionFieldSets);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+const uint8_t * sceneName;
+bool sceneNameExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+bool extensionFieldSetsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (sceneNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(sceneName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (extensionFieldSetsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            extensionFieldSetsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, const_cast<uint8_t*>(sceneName), extensionFieldSets);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterGetSceneMembershipCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterGetSceneMembershipCallback(groupId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_RECALL_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveAllScenesCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveAllScenesCallback(groupId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_STORE_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_VIEW_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterViewSceneCallback(groupId, sceneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterViewSceneCallback(groupId, sceneId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         default: {
@@ -7026,58 +6879,59 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Scenes
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
-    case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+    case ZCL_BARRIER_CONTROL_CLUSTER_ID :
         clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_BASIC_CLUSTER_ID:
+    case ZCL_BASIC_CLUSTER_ID :
         clusters::Basic::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_BINDING_CLUSTER_ID:
+    case ZCL_BINDING_CLUSTER_ID :
         clusters::Binding::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+    case ZCL_COLOR_CONTROL_CLUSTER_ID :
         clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_DOOR_LOCK_CLUSTER_ID:
+    case ZCL_DOOR_LOCK_CLUSTER_ID :
         clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+    case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID :
         clusters::GeneralCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_GROUPS_CLUSTER_ID:
+    case ZCL_GROUPS_CLUSTER_ID :
         clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_IAS_ZONE_CLUSTER_ID:
+    case ZCL_IAS_ZONE_CLUSTER_ID :
         clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_IDENTIFY_CLUSTER_ID:
+    case ZCL_IDENTIFY_CLUSTER_ID :
         clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+    case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_LOW_POWER_CLUSTER_ID:
+    case ZCL_LOW_POWER_CLUSTER_ID :
         clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+    case ZCL_ON_OFF_CLUSTER_ID :
         clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_SCENES_CLUSTER_ID:
+    case ZCL_SCENES_CLUSTER_ID :
         clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
     default:
diff --git a/examples/all-clusters-app/all-clusters-common/gen/af-structs.h b/examples/all-clusters-app/all-clusters-common/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/af-structs.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h b/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/examples/all-clusters-app/all-clusters-common/gen/attribute-size.h b/examples/all-clusters-app/all-clusters-common/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/attribute-size.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/examples/all-clusters-app/all-clusters-common/gen/attribute-type.h b/examples/all-clusters-app/all-clusters-common/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/attribute-type.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp b/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp
index 2ccd916d44cbbc..a4b6d6fed1729a 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp
+++ b/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -42,10 +42,12 @@ EmberAfStatus emberAfIdentifyClusterServerCommandParse(EmberAfClusterCommand * c
 EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfLowPowerClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfClusterCommand * cmd);
+EmberAfStatus emberAfOccupancySensingClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfTemperatureMeasurementClusterServerCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -66,6 +68,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -85,57 +88,61 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+        case ZCL_APPLICATION_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Application Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+        case ZCL_BARRIER_CONTROL_CLUSTER_ID :
             result = emberAfBarrierControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             result = emberAfBasicClusterServerCommandParse(cmd);
             break;
-        case ZCL_BINDING_CLUSTER_ID:
+        case ZCL_BINDING_CLUSTER_ID :
             result = emberAfBindingClusterServerCommandParse(cmd);
             break;
-        case ZCL_COLOR_CONTROL_CLUSTER_ID:
+        case ZCL_COLOR_CONTROL_CLUSTER_ID :
             result = emberAfColorControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_DOOR_LOCK_CLUSTER_ID:
+        case ZCL_DOOR_LOCK_CLUSTER_ID :
             result = emberAfDoorLockClusterServerCommandParse(cmd);
             break;
-        case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+        case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID :
             result = emberAfGeneralCommissioningClusterServerCommandParse(cmd);
             break;
-        case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+        case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID :
             // No commands are enabled for cluster Group Key Management
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_GROUPS_CLUSTER_ID:
+        case ZCL_GROUPS_CLUSTER_ID :
             result = emberAfGroupsClusterServerCommandParse(cmd);
             break;
-        case ZCL_IAS_ZONE_CLUSTER_ID:
+        case ZCL_IAS_ZONE_CLUSTER_ID :
             result = emberAfIasZoneClusterServerCommandParse(cmd);
             break;
-        case ZCL_IDENTIFY_CLUSTER_ID:
+        case ZCL_IDENTIFY_CLUSTER_ID :
             result = emberAfIdentifyClusterServerCommandParse(cmd);
             break;
-        case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        case ZCL_LEVEL_CONTROL_CLUSTER_ID :
             result = emberAfLevelControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_LOW_POWER_CLUSTER_ID:
+        case ZCL_LOW_POWER_CLUSTER_ID :
             result = emberAfLowPowerClusterServerCommandParse(cmd);
             break;
-        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
             result = emberAfNetworkCommissioningClusterServerCommandParse(cmd);
             break;
-        case ZCL_ON_OFF_CLUSTER_ID:
+        case ZCL_OCCUPANCY_SENSING_CLUSTER_ID :
+            // No commands are enabled for cluster Occupancy Sensing
+            result = status(false, true, cmd->mfgSpecific);
+            break;
+        case ZCL_ON_OFF_CLUSTER_ID :
             result = emberAfOnOffClusterServerCommandParse(cmd);
             break;
-        case ZCL_SCENES_CLUSTER_ID:
+        case ZCL_SCENES_CLUSTER_ID :
             result = emberAfScenesClusterServerCommandParse(cmd);
             break;
-        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
             // No commands are enabled for cluster Temperature Measurement
             result = status(false, true, cmd->mfgSpecific);
             break;
@@ -158,20 +165,20 @@ EmberAfStatus emberAfBarrierControlClusterServerCommandParse(EmberAfClusterComma
         switch (cmd->commandId)
         {
         case ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t percentOpen;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            percentOpen = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t percentOpen;
 
-            wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  percentOpen = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
             break;
         }
         case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: {
-            wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback();
+        wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback();
             break;
         }
         default: {
@@ -190,7 +197,7 @@ EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd)
     {
         if (cmd->mfgCode == 4098 && cmd->commandId == ZCL_MFG_SPECIFIC_PING_COMMAND_ID)
         {
-            wasHandled = emberAfBasicClusterMfgSpecificPingCallback();
+        wasHandled = emberAfBasicClusterMfgSpecificPingCallback();
         }
     }
     else
@@ -214,71 +221,71 @@ EmberAfStatus emberAfBindingClusterServerCommandParse(EmberAfClusterCommand * cm
         switch (cmd->commandId)
         {
         case ZCL_BIND_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::NodeId nodeId;
-            chip::GroupId groupId;
-            chip::EndpointId endpointId;
-            chip::ClusterId clusterId;
-
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            nodeId        = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endpointId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            clusterId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfBindingClusterBindCallback(nodeId, groupId, endpointId, clusterId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::NodeId nodeId;
+chip::GroupId groupId;
+chip::EndpointId endpointId;
+chip::ClusterId clusterId;
+
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  nodeId = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endpointId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  clusterId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfBindingClusterBindCallback(nodeId, groupId, endpointId, clusterId);
             break;
         }
         case ZCL_UNBIND_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::NodeId nodeId;
-            chip::GroupId groupId;
-            chip::EndpointId endpointId;
-            chip::ClusterId clusterId;
-
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            nodeId        = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endpointId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            clusterId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfBindingClusterUnbindCallback(nodeId, groupId, endpointId, clusterId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::NodeId nodeId;
+chip::GroupId groupId;
+chip::EndpointId endpointId;
+chip::ClusterId clusterId;
+
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  nodeId = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endpointId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  clusterId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfBindingClusterUnbindCallback(nodeId, groupId, endpointId, clusterId);
             break;
         }
         default: {
@@ -298,550 +305,542 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand
         switch (cmd->commandId)
         {
         case ZCL_MOVE_COLOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            int16_t rateX;
-            int16_t rateY;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rateX         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rateY         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+int16_t rateX;
+int16_t rateY;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rateX = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rateY = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint16_t rate;
-            uint16_t colorTemperatureMinimum;
-            uint16_t colorTemperatureMaximum;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(
-                moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint16_t rate;
+uint16_t colorTemperatureMinimum;
+uint16_t colorTemperatureMaximum;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_HUE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_COLOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t colorX;
-            uint16_t colorY;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorX        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorY        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t colorX;
+uint16_t colorY;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorX = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorY = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t colorTemperature;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperature = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset    = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask,
-                                                                                  optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t colorTemperature;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperature = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_HUE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t hue;
-            uint8_t direction;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            hue           = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            direction     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t hue;
+uint8_t direction;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  hue = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  direction = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t hue;
-            uint8_t saturation;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            hue           = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            saturation    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask,
-                                                                                  optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t hue;
+uint8_t saturation;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  hue = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  saturation = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t saturation;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            saturation    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t saturation;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  saturation = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_COLOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            int16_t stepX;
-            int16_t stepY;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepX         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepY         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+int16_t stepX;
+int16_t stepY;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepX = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepY = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint16_t stepSize;
-            uint16_t transitionTime;
-            uint16_t colorTemperatureMinimum;
-            uint16_t colorTemperatureMaximum;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(
-                stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint16_t stepSize;
+uint16_t transitionTime;
+uint16_t colorTemperatureMinimum;
+uint16_t colorTemperatureMaximum;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_HUE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint8_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint8_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint8_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint8_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STOP_MOVE_STEP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
             break;
         }
         default: {
@@ -861,454 +860,452 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_CLEAR_ALL_PINS_COMMAND_ID: {
-            wasHandled = emberAfDoorLockClusterClearAllPinsCallback();
+        wasHandled = emberAfDoorLockClusterClearAllPinsCallback();
             break;
         }
         case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: {
-            wasHandled = emberAfDoorLockClusterClearAllRfidsCallback();
+        wasHandled = emberAfDoorLockClusterClearAllRfidsCallback();
             break;
         }
         case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
             break;
         }
         case ZCL_CLEAR_PIN_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            wasHandled = emberAfDoorLockClusterClearPinCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearPinCallback(userId);
             break;
         }
         case ZCL_CLEAR_RFID_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearRfidCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearRfidCallback(userId);
             break;
         }
         case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
             break;
         }
         case ZCL_GET_LOG_RECORD_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t logIndex;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            logIndex = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t logIndex;
 
-            wasHandled = emberAfDoorLockClusterGetLogRecordCallback(logIndex);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  logIndex = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetLogRecordCallback(logIndex);
             break;
         }
         case ZCL_GET_PIN_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetPinCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetPinCallback(userId);
             break;
         }
         case ZCL_GET_RFID_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            wasHandled = emberAfDoorLockClusterGetRfidCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetRfidCallback(userId);
             break;
         }
         case ZCL_GET_USER_TYPE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            wasHandled = emberAfDoorLockClusterGetUserTypeCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetUserTypeCallback(userId);
             break;
         }
         case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_LOCK_DOOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t * PIN;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t * PIN;
 
-            wasHandled = emberAfDoorLockClusterLockDoorCallback(PIN);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterLockDoorCallback(PIN);
             break;
         }
         case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-            uint8_t operatingModeDuringHoliday;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime  = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime,
-                                                                          operatingModeDuringHoliday);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint32_t localStartTime;
+uint32_t localEndTime;
+uint8_t operatingModeDuringHoliday;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
             break;
         }
         case ZCL_SET_PIN_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, pin);
             break;
         }
         case ZCL_SET_RFID_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * id;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            id = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, id);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * id;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  id = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, id);
             break;
         }
         case ZCL_SET_USER_TYPE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userType;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userType;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
             break;
         }
         case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint8_t daysMask;
-            uint8_t startHour;
-            uint8_t startMinute;
-            uint8_t endHour;
-            uint8_t endMinute;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            daysMask      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startHour     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startMinute   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endHour       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute,
-                                                                          endHour, endMinute);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint8_t daysMask;
+uint8_t startHour;
+uint8_t startMinute;
+uint8_t endHour;
+uint8_t endMinute;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  daysMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
             break;
         }
         case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint32_t localStartTime;
+uint32_t localEndTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
             break;
         }
         case ZCL_UNLOCK_DOOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t * PIN;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t * PIN;
 
-            wasHandled = emberAfDoorLockClusterUnlockDoorCallback(PIN);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockDoorCallback(PIN);
             break;
         }
         case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t timeoutInSeconds;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutInSeconds = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset    = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t timeoutInSeconds;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutInSeconds = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin);
             break;
         }
         default: {
@@ -1328,74 +1325,74 @@ EmberAfStatus emberAfGeneralCommissioningClusterServerCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ARM_FAIL_SAFE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t expiryLengthSeconds;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            expiryLengthSeconds = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset       = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterArmFailSafeCallback(expiryLengthSeconds, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t expiryLengthSeconds;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  expiryLengthSeconds = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterArmFailSafeCallback(expiryLengthSeconds, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_COMMISSIONING_COMPLETE_COMMAND_ID: {
-            wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback();
+        wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteCallback();
             break;
         }
         case ZCL_SET_FABRIC_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan fabricId;
-            chip::ByteSpan fabricSecret;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                fabricId          = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + fabricId.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                fabricSecret      = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + fabricSecret.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterSetFabricCallback(fabricId, fabricSecret, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan fabricId;
+chip::ByteSpan fabricSecret;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  fabricId = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + fabricId.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  fabricSecret = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + fabricSecret.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterSetFabricCallback(fabricId, fabricSecret, breadcrumb, timeoutMs);
             break;
         }
         default: {
@@ -1415,89 +1412,89 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_GROUP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t * groupName;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterAddGroupCallback(groupId, groupName);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t * groupName;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterAddGroupCallback(groupId, groupName);
             break;
         }
         case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t * groupName;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, groupName);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t * groupName;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, groupName);
             break;
         }
         case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t groupCount;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t groupCount;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupCount    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            groupList     = cmd->buffer + payloadOffset;
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupCount = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    groupList = cmd->buffer + payloadOffset;
 
-            wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
+wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
             break;
         }
         case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: {
-            wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback();
+        wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback();
             break;
         }
         case ZCL_REMOVE_GROUP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            wasHandled = emberAfGroupsClusterRemoveGroupCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterRemoveGroupCallback(groupId);
             break;
         }
         case ZCL_VIEW_GROUP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            wasHandled = emberAfGroupsClusterViewGroupCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterViewGroupCallback(groupId);
             break;
         }
         default: {
@@ -1517,23 +1514,23 @@ EmberAfStatus emberAfIasZoneClusterServerCommandParse(EmberAfClusterCommand * cm
         switch (cmd->commandId)
         {
         case ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t enrollResponseCode;
-            uint8_t zoneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            enrollResponseCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset      = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t enrollResponseCode;
+uint8_t zoneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  enrollResponseCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
             break;
         }
         default: {
@@ -1553,20 +1550,20 @@ EmberAfStatus emberAfIdentifyClusterServerCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_IDENTIFY_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t identifyTime;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            identifyTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t identifyTime;
 
-            wasHandled = emberAfIdentifyClusterIdentifyCallback(identifyTime);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  identifyTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfIdentifyClusterIdentifyCallback(identifyTime);
             break;
         }
         case ZCL_IDENTIFY_QUERY_COMMAND_ID: {
-            wasHandled = emberAfIdentifyClusterIdentifyQueryCallback();
+        wasHandled = emberAfIdentifyClusterIdentifyQueryCallback();
             break;
         }
         default: {
@@ -1586,203 +1583,203 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
         switch (cmd->commandId)
         {
         case ZCL_MOVE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
             break;
         }
         case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
             break;
         }
         case ZCL_STEP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
             break;
         }
         case ZCL_STOP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
             break;
         }
         case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
-            wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
+        wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
             break;
         }
         default: {
@@ -1802,7 +1799,7 @@ EmberAfStatus emberAfLowPowerClusterServerCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_SLEEP_COMMAND_ID: {
-            wasHandled = emberAfLowPowerClusterSleepCallback();
+        wasHandled = emberAfLowPowerClusterSleepCallback();
             break;
         }
         default: {
@@ -1822,276 +1819,276 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+  if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan NetworkID;
-            uint64_t Breadcrumb;
-            uint32_t TimeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                NetworkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            Breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan NetworkID;
+uint64_t Breadcrumb;
+uint32_t TimeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  NetworkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  Breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         default: {
@@ -2111,15 +2108,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd)
         switch (cmd->commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOffCallback();
+        wasHandled = emberAfOnOffClusterOffCallback();
             break;
         }
         case ZCL_ON_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOnCallback();
+        wasHandled = emberAfOnOffClusterOnCallback();
             break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterToggleCallback();
+        wasHandled = emberAfOnOffClusterToggleCallback();
             break;
         }
         default: {
@@ -2139,153 +2136,153 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-            uint16_t transitionTime;
-            uint8_t * sceneName;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneName          = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset      = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
-            extensionFieldSets = cmd->buffer + payloadOffset;
-
-            wasHandled = emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+uint16_t transitionTime;
+uint8_t * sceneName;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
+  extensionFieldSets = cmd->buffer + payloadOffset;
+
+wasHandled = emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterGetSceneMembershipCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterGetSceneMembershipCallback(groupId);
             break;
         }
         case ZCL_RECALL_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            wasHandled = emberAfScenesClusterRemoveAllScenesCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveAllScenesCallback(groupId);
             break;
         }
         case ZCL_REMOVE_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
             break;
         }
         case ZCL_STORE_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
             break;
         }
         case ZCL_VIEW_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterViewSceneCallback(groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterViewSceneCallback(groupId, sceneId);
             break;
         }
         default: {
diff --git a/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp b/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp
index 78c771016aa1f9..900fb60a97417f 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp
+++ b/examples/all-clusters-app/all-clusters-common/gen/callback-stub.cpp
@@ -29,55 +29,58 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+     case ZCL_APPLICATION_BASIC_CLUSTER_ID :
         emberAfApplicationBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+     case ZCL_BARRIER_CONTROL_CLUSTER_ID :
         emberAfBarrierControlClusterInitCallback(endpoint);
         break;
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_BINDING_CLUSTER_ID:
+     case ZCL_BINDING_CLUSTER_ID :
         emberAfBindingClusterInitCallback(endpoint);
         break;
-    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+     case ZCL_COLOR_CONTROL_CLUSTER_ID :
         emberAfColorControlClusterInitCallback(endpoint);
         break;
-    case ZCL_DOOR_LOCK_CLUSTER_ID:
+     case ZCL_DOOR_LOCK_CLUSTER_ID :
         emberAfDoorLockClusterInitCallback(endpoint);
         break;
-    case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+     case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID :
         emberAfGeneralCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID:
+     case ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID :
         emberAfGroupKeyManagementClusterInitCallback(endpoint);
         break;
-    case ZCL_GROUPS_CLUSTER_ID:
+     case ZCL_GROUPS_CLUSTER_ID :
         emberAfGroupsClusterInitCallback(endpoint);
         break;
-    case ZCL_IAS_ZONE_CLUSTER_ID:
+     case ZCL_IAS_ZONE_CLUSTER_ID :
         emberAfIasZoneClusterInitCallback(endpoint);
         break;
-    case ZCL_IDENTIFY_CLUSTER_ID:
+     case ZCL_IDENTIFY_CLUSTER_ID :
         emberAfIdentifyClusterInitCallback(endpoint);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+     case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
-    case ZCL_LOW_POWER_CLUSTER_ID:
+     case ZCL_LOW_POWER_CLUSTER_ID :
         emberAfLowPowerClusterInitCallback(endpoint);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+     case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         emberAfNetworkCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+     case ZCL_OCCUPANCY_SENSING_CLUSTER_ID :
+        emberAfOccupancySensingClusterInitCallback(endpoint);
+        break;
+     case ZCL_ON_OFF_CLUSTER_ID :
         emberAfOnOffClusterInitCallback(endpoint);
         break;
-    case ZCL_SCENES_CLUSTER_ID:
+     case ZCL_SCENES_CLUSTER_ID :
         emberAfScenesClusterInitCallback(endpoint);
         break;
-    case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+     case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
         emberAfTemperatureMeasurementClusterInitCallback(endpoint);
         break;
     default:
@@ -156,6 +159,11 @@ void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(Endpoi
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfOccupancySensingClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfOnOffClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -236,9 +244,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -253,8 +262,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -269,8 +279,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -287,7 +298,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -304,7 +316,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -321,7 +334,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -346,8 +360,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -366,9 +381,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -387,9 +402,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -407,7 +422,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -431,7 +447,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -454,9 +471,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -478,9 +496,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -500,10 +519,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -516,7 +537,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -557,9 +579,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -575,7 +598,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -626,9 +650,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -644,7 +669,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -680,8 +706,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -716,8 +743,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/examples/all-clusters-app/all-clusters-common/gen/callback.h b/examples/all-clusters-app/all-clusters-common/gen/callback.h
index d368a6e74dd0cd..ca4e5620b2d2b4 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/callback.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Application Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Barrier Control Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -63,6 +66,7 @@ void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Binding Cluster Init
  *
  * Cluster Init
@@ -71,6 +75,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBindingClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Color Control Cluster Init
  *
  * Cluster Init
@@ -79,6 +84,7 @@ void emberAfBindingClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Door Lock Cluster Init
  *
  * Cluster Init
@@ -87,6 +93,7 @@ void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief General Commissioning Cluster Init
  *
  * Cluster Init
@@ -95,6 +102,7 @@ void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGeneralCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Group Key Management Cluster Init
  *
  * Cluster Init
@@ -103,6 +111,7 @@ void emberAfGeneralCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGroupKeyManagementClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Groups Cluster Init
  *
  * Cluster Init
@@ -111,6 +120,7 @@ void emberAfGroupKeyManagementClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief IAS Zone Cluster Init
  *
  * Cluster Init
@@ -119,6 +129,7 @@ void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfIasZoneClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Identify Cluster Init
  *
  * Cluster Init
@@ -127,6 +138,7 @@ void emberAfIasZoneClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Level Control Cluster Init
  *
  * Cluster Init
@@ -135,6 +147,7 @@ void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Low Power Cluster Init
  *
  * Cluster Init
@@ -143,6 +156,7 @@ void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Network Commissioning Cluster Init
  *
  * Cluster Init
@@ -151,6 +165,16 @@ void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
+/** @brief Occupancy Sensing Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOccupancySensingClusterInitCallback(chip::EndpointId endpoint);
+
+
 /** @brief On/off Cluster Init
  *
  * Cluster Init
@@ -159,6 +183,7 @@ void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Scenes Cluster Init
  *
  * Cluster Init
@@ -167,6 +192,7 @@ void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Temperature Measurement Cluster Init
  *
  * Cluster Init
@@ -175,8 +201,10 @@ void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfTemperatureMeasurementClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Application Basic Cluster server
 //
@@ -206,9 +234,7 @@ void emberAfApplicationBasicClusterServerAttributeChangedCallback(chip::Endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                      chip::AttributeId attributeId,
-                                                                                      uint16_t manufacturerCode);
+void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Application Basic Cluster Server Message Sent
  *
@@ -221,9 +247,7 @@ void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCal
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                             EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                             EmberStatus status);
+void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Application Basic Cluster Server Pre Attribute Changed
  *
@@ -235,10 +259,7 @@ void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessag
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfApplicationBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              EmberAfAttributeType attributeType, uint8_t size,
-                                                                              uint8_t * value);
+EmberAfStatus emberAfApplicationBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Application Basic Cluster Server Tick
  *
@@ -277,9 +298,7 @@ void emberAfBarrierControlClusterServerAttributeChangedCallback(chip::EndpointId
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBarrierControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    uint16_t manufacturerCode);
+void emberAfBarrierControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Barrier Control Cluster Server Message Sent
  *
@@ -292,9 +311,7 @@ void emberAfBarrierControlClusterServerManufacturerSpecificAttributeChangedCallb
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                           EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                           EmberStatus status);
+void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Barrier Control Cluster Server Pre Attribute Changed
  *
@@ -306,10 +323,7 @@ void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageT
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBarrierControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            EmberAfAttributeType attributeType, uint8_t size,
-                                                                            uint8_t * value);
+EmberAfStatus emberAfBarrierControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Barrier Control Cluster Server Tick
  *
@@ -348,8 +362,7 @@ void emberAfBasicClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Server Message Sent
  *
@@ -362,8 +375,7 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Server Pre Attribute Changed
  *
@@ -375,9 +387,7 @@ void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Server Tick
  *
@@ -416,9 +426,7 @@ void emberAfBindingClusterServerAttributeChangedCallback(chip::EndpointId endpoi
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBindingClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                             chip::AttributeId attributeId,
-                                                                             uint16_t manufacturerCode);
+void emberAfBindingClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Binding Cluster Server Message Sent
  *
@@ -431,9 +439,7 @@ void emberAfBindingClusterServerManufacturerSpecificAttributeChangedCallback(chi
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBindingClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                    EmberStatus status);
+void emberAfBindingClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Binding Cluster Server Pre Attribute Changed
  *
@@ -445,9 +451,7 @@ void emberAfBindingClusterServerMessageSentCallback(EmberOutgoingMessageType typ
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBindingClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                     EmberAfAttributeType attributeType, uint8_t size,
-                                                                     uint8_t * value);
+EmberAfStatus emberAfBindingClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Binding Cluster Server Tick
  *
@@ -486,9 +490,7 @@ void emberAfColorControlClusterServerAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Color Control Cluster Server Message Sent
  *
@@ -501,9 +503,7 @@ void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Color Control Cluster Server Pre Attribute Changed
  *
@@ -515,9 +515,7 @@ void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfColorControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfColorControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Color Control Cluster Server Tick
  *
@@ -556,9 +554,7 @@ void emberAfDoorLockClusterServerAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfDoorLockClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfDoorLockClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Door Lock Cluster Server Message Sent
  *
@@ -571,9 +567,7 @@ void emberAfDoorLockClusterServerManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Door Lock Cluster Server Pre Attribute Changed
  *
@@ -585,9 +579,7 @@ void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfDoorLockClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfDoorLockClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Door Lock Cluster Server Tick
  *
@@ -626,9 +618,7 @@ void emberAfGeneralCommissioningClusterServerAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief General Commissioning Cluster Server Message Sent
  *
@@ -641,9 +631,7 @@ void emberAfGeneralCommissioningClusterServerManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief General Commissioning Cluster Server Pre Attribute Changed
  *
@@ -655,10 +643,7 @@ void emberAfGeneralCommissioningClusterServerMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGeneralCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfGeneralCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief General Commissioning Cluster Server Tick
  *
@@ -697,9 +682,7 @@ void emberAfGroupKeyManagementClusterServerAttributeChangedCallback(chip::Endpoi
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGroupKeyManagementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                        chip::AttributeId attributeId,
-                                                                                        uint16_t manufacturerCode);
+void emberAfGroupKeyManagementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Group Key Management Cluster Server Message Sent
  *
@@ -712,9 +695,7 @@ void emberAfGroupKeyManagementClusterServerManufacturerSpecificAttributeChangedC
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGroupKeyManagementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                               EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                               EmberStatus status);
+void emberAfGroupKeyManagementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Group Key Management Cluster Server Pre Attribute Changed
  *
@@ -726,10 +707,7 @@ void emberAfGroupKeyManagementClusterServerMessageSentCallback(EmberOutgoingMess
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGroupKeyManagementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                chip::AttributeId attributeId,
-                                                                                EmberAfAttributeType attributeType, uint8_t size,
-                                                                                uint8_t * value);
+EmberAfStatus emberAfGroupKeyManagementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Group Key Management Cluster Server Tick
  *
@@ -768,9 +746,7 @@ void emberAfGroupsClusterServerAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Groups Cluster Server Message Sent
  *
@@ -783,9 +759,7 @@ void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Groups Cluster Server Pre Attribute Changed
  *
@@ -797,9 +771,7 @@ void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGroupsClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfGroupsClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Groups Cluster Server Tick
  *
@@ -838,9 +810,7 @@ void emberAfIasZoneClusterServerAttributeChangedCallback(chip::EndpointId endpoi
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfIasZoneClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                             chip::AttributeId attributeId,
-                                                                             uint16_t manufacturerCode);
+void emberAfIasZoneClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief IAS Zone Cluster Server Message Sent
  *
@@ -853,9 +823,7 @@ void emberAfIasZoneClusterServerManufacturerSpecificAttributeChangedCallback(chi
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                    EmberStatus status);
+void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief IAS Zone Cluster Server Pre Attribute Changed
  *
@@ -867,9 +835,7 @@ void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType typ
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfIasZoneClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                     EmberAfAttributeType attributeType, uint8_t size,
-                                                                     uint8_t * value);
+EmberAfStatus emberAfIasZoneClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief IAS Zone Cluster Server Tick
  *
@@ -908,9 +874,7 @@ void emberAfIdentifyClusterServerAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Identify Cluster Server Message Sent
  *
@@ -923,9 +887,7 @@ void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Identify Cluster Server Pre Attribute Changed
  *
@@ -937,9 +899,7 @@ void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfIdentifyClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfIdentifyClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Identify Cluster Server Tick
  *
@@ -978,9 +938,7 @@ void emberAfLevelControlClusterServerAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Level Control Cluster Server Message Sent
  *
@@ -993,9 +951,7 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Level Control Cluster Server Pre Attribute Changed
  *
@@ -1007,9 +963,7 @@ void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Level Control Cluster Server Tick
  *
@@ -1048,9 +1002,7 @@ void emberAfLowPowerClusterServerAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Low Power Cluster Server Message Sent
  *
@@ -1063,9 +1015,7 @@ void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Low Power Cluster Server Pre Attribute Changed
  *
@@ -1077,9 +1027,7 @@ void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLowPowerClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfLowPowerClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Low Power Cluster Server Tick
  *
@@ -1118,9 +1066,7 @@ void emberAfNetworkCommissioningClusterServerAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Network Commissioning Cluster Server Message Sent
  *
@@ -1133,9 +1079,7 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Network Commissioning Cluster Server Pre Attribute Changed
  *
@@ -1147,10 +1091,7 @@ void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Network Commissioning Cluster Server Tick
  *
@@ -1160,6 +1101,70 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallbac
  */
 void emberAfNetworkCommissioningClusterServerTickCallback(chip::EndpointId endpoint);
 
+//
+// Occupancy Sensing Cluster server
+//
+
+/** @brief Occupancy Sensing Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOccupancySensingClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Occupancy Sensing Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param endpoint    Endpoint that is being initialized
+ * @param attributeId Attribute that changed
+ */
+void emberAfOccupancySensingClusterServerAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId);
+
+/** @brief Occupancy Sensing Cluster Server Manufacturer Specific Attribute Changed
+ *
+ * Server Manufacturer Specific Attribute Changed
+ *
+ * @param endpoint          Endpoint that is being initialized
+ * @param attributeId       Attribute that changed
+ * @param manufacturerCode  Manufacturer Code of the attribute that changed
+ */
+void emberAfOccupancySensingClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
+
+/** @brief Occupancy Sensing Cluster Server Message Sent
+ *
+ * Server Message Sent
+ *
+ * @param type               The type of message sent
+ * @param indexOrDestination The destination or address to which the message was sent
+ * @param apsFrame           The APS frame for the message
+ * @param msgLen             The length of the message
+ * @param message            The message that was sent
+ * @param status             The status of the sent message
+ */
+void emberAfOccupancySensingClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+
+/** @brief Occupancy Sensing Cluster Server Pre Attribute Changed
+ *
+ * server Pre Attribute Changed
+ *
+ * @param endpoint      Endpoint that is being initialized
+ * @param attributeId   Attribute to be changed
+ * @param attributeType Attribute type
+ * @param size          Attribute size
+ * @param value         Attribute value
+ */
+EmberAfStatus emberAfOccupancySensingClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
+
+/** @brief Occupancy Sensing Cluster Server Tick
+ *
+ * server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfOccupancySensingClusterServerTickCallback(chip::EndpointId endpoint);
+
 //
 // On/off Cluster server
 //
@@ -1189,8 +1194,7 @@ void emberAfOnOffClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief On/off Cluster Server Message Sent
  *
@@ -1203,8 +1207,7 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief On/off Cluster Server Pre Attribute Changed
  *
@@ -1216,9 +1219,7 @@ void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief On/off Cluster Server Tick
  *
@@ -1257,9 +1258,7 @@ void emberAfScenesClusterServerAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Scenes Cluster Server Message Sent
  *
@@ -1272,9 +1271,7 @@ void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Scenes Cluster Server Pre Attribute Changed
  *
@@ -1286,9 +1283,7 @@ void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfScenesClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfScenesClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Scenes Cluster Server Tick
  *
@@ -1327,9 +1322,7 @@ void emberAfTemperatureMeasurementClusterServerAttributeChangedCallback(chip::En
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                            chip::AttributeId attributeId,
-                                                                                            uint16_t manufacturerCode);
+void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Temperature Measurement Cluster Server Message Sent
  *
@@ -1342,9 +1335,7 @@ void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChan
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                   EmberStatus status);
+void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Temperature Measurement Cluster Server Pre Attribute Changed
  *
@@ -1356,10 +1347,7 @@ void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoing
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfTemperatureMeasurementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    EmberAfAttributeType attributeType,
-                                                                                    uint8_t size, uint8_t * value);
+EmberAfStatus emberAfTemperatureMeasurementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Temperature Measurement Cluster Server Tick
  *
@@ -1372,725 +1360,700 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end
 // Cluster Commands Callback
 
 /**
- * @brief Barrier Control Cluster BarrierControlGoToPercent Command callback
- * @param percentOpen
- */
+* @brief Barrier Control Cluster BarrierControlGoToPercent Command callback
+* @param percentOpen
+*/
 
 bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t percentOpen);
 
 /**
- * @brief Barrier Control Cluster BarrierControlStop Command callback
- */
+* @brief Barrier Control Cluster BarrierControlStop Command callback
+*/
 
 bool emberAfBarrierControlClusterBarrierControlStopCallback();
 
 /**
- * @brief Basic Cluster MfgSpecificPing Command callback
- */
+* @brief Basic Cluster MfgSpecificPing Command callback
+*/
 
 bool emberAfBasicClusterMfgSpecificPingCallback();
 
 /**
- * @brief Binding Cluster Bind Command callback
- * @param nodeId
- * @param groupId
- * @param endpointId
- * @param clusterId
- */
+* @brief Binding Cluster Bind Command callback
+* @param nodeId
+* @param groupId
+* @param endpointId
+* @param clusterId
+*/
 
-bool emberAfBindingClusterBindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId,
-                                       chip::ClusterId clusterId);
+bool emberAfBindingClusterBindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
 
 /**
- * @brief Binding Cluster Unbind Command callback
- * @param nodeId
- * @param groupId
- * @param endpointId
- * @param clusterId
- */
+* @brief Binding Cluster Unbind Command callback
+* @param nodeId
+* @param groupId
+* @param endpointId
+* @param clusterId
+*/
 
-bool emberAfBindingClusterUnbindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId,
-                                         chip::ClusterId clusterId);
+bool emberAfBindingClusterUnbindCallback(chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
 
 /**
- * @brief Color Control Cluster MoveColor Command callback
- * @param rateX
- * @param rateY
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveColor Command callback
+* @param rateX
+* @param rateY
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveColorTemperature Command callback
- * @param moveMode
- * @param rate
- * @param colorTemperatureMinimum
- * @param colorTemperatureMaximum
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveColorTemperature Command callback
+* @param moveMode
+* @param rate
+* @param colorTemperatureMinimum
+* @param colorTemperatureMaximum
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum,
-                                                            uint16_t colorTemperatureMaximum, uint8_t optionsMask,
-                                                            uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveHue Command callback
- * @param moveMode
- * @param rate
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveHue Command callback
+* @param moveMode
+* @param rate
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveSaturation Command callback
- * @param moveMode
- * @param rate
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveSaturation Command callback
+* @param moveMode
+* @param rate
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToColor Command callback
- * @param colorX
- * @param colorY
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToColor Command callback
+* @param colorX
+* @param colorY
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask,
-                                                   uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToColorTemperature Command callback
- * @param colorTemperature
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToColorTemperature Command callback
+* @param colorTemperature
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemperature, uint16_t transitionTime,
-                                                              uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToHue Command callback
- * @param hue
- * @param direction
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToHue Command callback
+* @param hue
+* @param direction
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask,
-                                                 uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToHueAndSaturation Command callback
- * @param hue
- * @param saturation
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToHueAndSaturation Command callback
+* @param hue
+* @param saturation
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8_t saturation, uint16_t transitionTime,
-                                                              uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToSaturation Command callback
- * @param saturation
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToSaturation Command callback
+* @param saturation
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask,
-                                                        uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepColor Command callback
- * @param stepX
- * @param stepY
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepColor Command callback
+* @param stepX
+* @param stepY
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask,
-                                                 uint8_t optionsOverride);
+bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepColorTemperature Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param colorTemperatureMinimum
- * @param colorTemperatureMaximum
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepColorTemperature Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param colorTemperatureMinimum
+* @param colorTemperatureMaximum
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime,
-                                                            uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum,
-                                                            uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepHue Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepHue Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask,
-                                               uint8_t optionsOverride);
+bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepSaturation Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepSaturation Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime,
-                                                      uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StopMoveStep Command callback
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StopMoveStep Command callback
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterStopMoveStepCallback(uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Door Lock Cluster ClearAllPins Command callback
- */
+* @brief Door Lock Cluster ClearAllPins Command callback
+*/
 
 bool emberAfDoorLockClusterClearAllPinsCallback();
 
 /**
- * @brief Door Lock Cluster ClearAllRfids Command callback
- */
+* @brief Door Lock Cluster ClearAllRfids Command callback
+*/
 
 bool emberAfDoorLockClusterClearAllRfidsCallback();
 
 /**
- * @brief Door Lock Cluster ClearHolidaySchedule Command callback
- * @param scheduleId
- */
+* @brief Door Lock Cluster ClearHolidaySchedule Command callback
+* @param scheduleId
+*/
 
 bool emberAfDoorLockClusterClearHolidayScheduleCallback(uint8_t scheduleId);
 
 /**
- * @brief Door Lock Cluster ClearPin Command callback
- * @param userId
- */
+* @brief Door Lock Cluster ClearPin Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearPinCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster ClearRfid Command callback
- * @param userId
- */
+* @brief Door Lock Cluster ClearRfid Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster ClearWeekdaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster ClearWeekdaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster ClearYeardaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster ClearYeardaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetHolidaySchedule Command callback
- * @param scheduleId
- */
+* @brief Door Lock Cluster GetHolidaySchedule Command callback
+* @param scheduleId
+*/
 
 bool emberAfDoorLockClusterGetHolidayScheduleCallback(uint8_t scheduleId);
 
 /**
- * @brief Door Lock Cluster GetLogRecord Command callback
- * @param logIndex
- */
+* @brief Door Lock Cluster GetLogRecord Command callback
+* @param logIndex
+*/
 
 bool emberAfDoorLockClusterGetLogRecordCallback(uint16_t logIndex);
 
 /**
- * @brief Door Lock Cluster GetPin Command callback
- * @param userId
- */
+* @brief Door Lock Cluster GetPin Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetPinCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetRfid Command callback
- * @param userId
- */
+* @brief Door Lock Cluster GetRfid Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetUserType Command callback
- * @param userId
- */
+* @brief Door Lock Cluster GetUserType Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetWeekdaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster GetWeekdaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetYeardaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster GetYeardaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster LockDoor Command callback
- * @param pin
- */
+* @brief Door Lock Cluster LockDoor Command callback
+* @param pin
+*/
 
 bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN);
 
 /**
- * @brief Door Lock Cluster SetHolidaySchedule Command callback
- * @param scheduleId
- * @param localStartTime
- * @param localEndTime
- * @param operatingModeDuringHoliday
- */
+* @brief Door Lock Cluster SetHolidaySchedule Command callback
+* @param scheduleId
+* @param localStartTime
+* @param localEndTime
+* @param operatingModeDuringHoliday
+*/
 
-bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime,
-                                                      uint8_t operatingModeDuringHoliday);
+bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
 
 /**
- * @brief Door Lock Cluster SetPin Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param pin
- */
+* @brief Door Lock Cluster SetPin Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param pin
+*/
 
 bool emberAfDoorLockClusterSetPinCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin);
 
 /**
- * @brief Door Lock Cluster SetRfid Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param id
- */
+* @brief Door Lock Cluster SetRfid Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param id
+*/
 
 bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * id);
 
 /**
- * @brief Door Lock Cluster SetUserType Command callback
- * @param userId
- * @param userType
- */
+* @brief Door Lock Cluster SetUserType Command callback
+* @param userId
+* @param userType
+*/
 
 bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType);
 
 /**
- * @brief Door Lock Cluster SetWeekdaySchedule Command callback
- * @param scheduleId
- * @param userId
- * @param daysMask
- * @param startHour
- * @param startMinute
- * @param endHour
- * @param endMinute
- */
+* @brief Door Lock Cluster SetWeekdaySchedule Command callback
+* @param scheduleId
+* @param userId
+* @param daysMask
+* @param startHour
+* @param startMinute
+* @param endHour
+* @param endMinute
+*/
 
-bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour,
-                                                      uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
 /**
- * @brief Door Lock Cluster SetYeardaySchedule Command callback
- * @param scheduleId
- * @param userId
- * @param localStartTime
- * @param localEndTime
- */
+* @brief Door Lock Cluster SetYeardaySchedule Command callback
+* @param scheduleId
+* @param userId
+* @param localStartTime
+* @param localEndTime
+*/
 
-bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint32_t localStartTime,
-                                                      uint32_t localEndTime);
+bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime);
 
 /**
- * @brief Door Lock Cluster UnlockDoor Command callback
- * @param pin
- */
+* @brief Door Lock Cluster UnlockDoor Command callback
+* @param pin
+*/
 
 bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN);
 
 /**
- * @brief Door Lock Cluster UnlockWithTimeout Command callback
- * @param timeoutInSeconds
- * @param pin
- */
+* @brief Door Lock Cluster UnlockWithTimeout Command callback
+* @param timeoutInSeconds
+* @param pin
+*/
 
 bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, uint8_t * pin);
 
 /**
- * @brief General Commissioning Cluster ArmFailSafe Command callback
- * @param expiryLengthSeconds
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief General Commissioning Cluster ArmFailSafe Command callback
+* @param expiryLengthSeconds
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfGeneralCommissioningClusterArmFailSafeCallback(uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief General Commissioning Cluster CommissioningComplete Command callback
- */
+* @brief General Commissioning Cluster CommissioningComplete Command callback
+*/
 
 bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback();
 
 /**
- * @brief General Commissioning Cluster SetFabric Command callback
- * @param fabricId
- * @param fabricSecret
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief General Commissioning Cluster SetFabric Command callback
+* @param fabricId
+* @param fabricSecret
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb,
-                                                         uint32_t timeoutMs);
+bool emberAfGeneralCommissioningClusterSetFabricCallback(chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Groups Cluster AddGroup Command callback
- * @param groupId
- * @param groupName
- */
+* @brief Groups Cluster AddGroup Command callback
+* @param groupId
+* @param groupName
+*/
 
 bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName);
 
 /**
- * @brief Groups Cluster AddGroupIfIdentifying Command callback
- * @param groupId
- * @param groupName
- */
+* @brief Groups Cluster AddGroupIfIdentifying Command callback
+* @param groupId
+* @param groupName
+*/
 
 bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * groupName);
 
 /**
- * @brief Groups Cluster GetGroupMembership Command callback
- * @param groupCount
- * @param groupList
- */
+* @brief Groups Cluster GetGroupMembership Command callback
+* @param groupCount
+* @param groupList
+*/
 
-bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount,
-                                                    /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
+bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList);
 
 /**
- * @brief Groups Cluster RemoveAllGroups Command callback
- */
+* @brief Groups Cluster RemoveAllGroups Command callback
+*/
 
 bool emberAfGroupsClusterRemoveAllGroupsCallback();
 
 /**
- * @brief Groups Cluster RemoveGroup Command callback
- * @param groupId
- */
+* @brief Groups Cluster RemoveGroup Command callback
+* @param groupId
+*/
 
 bool emberAfGroupsClusterRemoveGroupCallback(uint16_t groupId);
 
 /**
- * @brief Groups Cluster ViewGroup Command callback
- * @param groupId
- */
+* @brief Groups Cluster ViewGroup Command callback
+* @param groupId
+*/
 
 bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId);
 
 /**
- * @brief IAS Zone Cluster ZoneEnrollResponse Command callback
- * @param enrollResponseCode
- * @param zoneId
- */
+* @brief IAS Zone Cluster ZoneEnrollResponse Command callback
+* @param enrollResponseCode
+* @param zoneId
+*/
 
 bool emberAfIasZoneClusterZoneEnrollResponseCallback(uint8_t enrollResponseCode, uint8_t zoneId);
 
 /**
- * @brief Identify Cluster Identify Command callback
- * @param identifyTime
- */
+* @brief Identify Cluster Identify Command callback
+* @param identifyTime
+*/
 
 bool emberAfIdentifyClusterIdentifyCallback(uint16_t identifyTime);
 
 /**
- * @brief Identify Cluster IdentifyQuery Command callback
- */
+* @brief Identify Cluster IdentifyQuery Command callback
+*/
 
 bool emberAfIdentifyClusterIdentifyQueryCallback();
 
 /**
- * @brief Level Control Cluster Move Command callback
- * @param moveMode
- * @param rate
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Move Command callback
+* @param moveMode
+* @param rate
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevel Command callback
- * @param level
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster MoveToLevel Command callback
+* @param level
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask,
-                                                   uint8_t optionOverride);
+bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevelWithOnOff Command callback
- * @param level
- * @param transitionTime
- */
+* @brief Level Control Cluster MoveToLevelWithOnOff Command callback
+* @param level
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster MoveWithOnOff Command callback
- * @param moveMode
- * @param rate
- */
+* @brief Level Control Cluster MoveWithOnOff Command callback
+* @param moveMode
+* @param rate
+*/
 
 bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate);
 
 /**
- * @brief Level Control Cluster Step Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Step Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask,
-                                            uint8_t optionOverride);
+bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StepWithOnOff Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- */
+* @brief Level Control Cluster StepWithOnOff Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster Stop Command callback
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Stop Command callback
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StopWithOnOff Command callback
- */
+* @brief Level Control Cluster StopWithOnOff Command callback
+*/
 
 bool emberAfLevelControlClusterStopWithOnOffCallback();
 
 /**
- * @brief Low Power Cluster Sleep Command callback
- */
+* @brief Low Power Cluster Sleep Command callback
+*/
 
 bool emberAfLowPowerClusterSleepCallback();
 
 /**
- * @brief Network Commissioning Cluster AddThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster AddWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb,
-                                                              uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster DisableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster DisableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster EnableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster EnableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster RemoveNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster RemoveNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs);
 
 /**
- * @brief Network Commissioning Cluster ScanNetworks Command callback
- * @param ssid
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster ScanNetworks Command callback
+* @param ssid
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                   uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                 uint64_t breadcrumb, uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief On/off Cluster Off Command callback
- */
+* @brief On/off Cluster Off Command callback
+*/
 
 bool emberAfOnOffClusterOffCallback();
 
 /**
- * @brief On/off Cluster On Command callback
- */
+* @brief On/off Cluster On Command callback
+*/
 
 bool emberAfOnOffClusterOnCallback();
 
 /**
- * @brief On/off Cluster Toggle Command callback
- */
+* @brief On/off Cluster Toggle Command callback
+*/
 
 bool emberAfOnOffClusterToggleCallback();
 
 /**
- * @brief Scenes Cluster AddScene Command callback
- * @param groupId
- * @param sceneId
- * @param transitionTime
- * @param sceneName
- * @param extensionFieldSets
- */
+* @brief Scenes Cluster AddScene Command callback
+* @param groupId
+* @param sceneId
+* @param transitionTime
+* @param sceneName
+* @param extensionFieldSets
+*/
 
-bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
-                                          /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
+bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets);
 
 /**
- * @brief Scenes Cluster GetSceneMembership Command callback
- * @param groupId
- */
+* @brief Scenes Cluster GetSceneMembership Command callback
+* @param groupId
+*/
 
 bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId);
 
 /**
- * @brief Scenes Cluster RecallScene Command callback
- * @param groupId
- * @param sceneId
- * @param transitionTime
- */
+* @brief Scenes Cluster RecallScene Command callback
+* @param groupId
+* @param sceneId
+* @param transitionTime
+*/
 
 bool emberAfScenesClusterRecallSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime);
 
 /**
- * @brief Scenes Cluster RemoveAllScenes Command callback
- * @param groupId
- */
+* @brief Scenes Cluster RemoveAllScenes Command callback
+* @param groupId
+*/
 
 bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId);
 
 /**
- * @brief Scenes Cluster RemoveScene Command callback
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster RemoveScene Command callback
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster StoreScene Command callback
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster StoreScene Command callback
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster ViewScene Command callback
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster ViewScene Command callback
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterViewSceneCallback(uint16_t groupId, uint8_t sceneId);
 
+
 //
 // Non-Cluster Related Callbacks
 //
@@ -2247,8 +2210,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -2267,6 +2230,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -2284,6 +2248,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -2377,8 +2342,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -2537,8 +2502,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/examples/all-clusters-app/all-clusters-common/gen/client-command-macro.h b/examples/all-clusters-app/all-clusters-common/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/client-command-macro.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/examples/all-clusters-app/all-clusters-common/gen/cluster-id.h b/examples/all-clusters-app/all-clusters-common/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/cluster-id.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/examples/all-clusters-app/all-clusters-common/gen/command-id.h b/examples/all-clusters-app/all-clusters-common/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/command-id.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h b/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h
index 44504b93d97ac0..f01303c5ff398d 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/endpoint_config.h
@@ -20,610 +20,386 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                                  \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                       \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 244 - Default for cluster: "General Commissioning", attribute: "FabricId". side: server, big-endian */              \
-            1, 'o', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                            \
-                                                                                                                                   \
-            /* 252 - Default for cluster: "General Commissioning", attribute: "Breadcrumb". side: server, big-endian */            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 260 - Default for cluster: "Color Control", attribute: "compensation text". side: server, big-endian */             \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 514 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, big-endian */                    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 522 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, big-endian */               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 554 - Default for cluster: "Application Basic", attribute: "application name". side: server, big-endian */          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 586 - Default for cluster: "Application Basic", attribute: "application id". side: server, big-endian */            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 618 - Default for cluster: "Group Key Management", attribute: "groups". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 872 - Default for cluster: "Group Key Management", attribute: "group keys". side: server, big-endian */             \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 1126 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 1158 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 1190 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 1222 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                             \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 1238 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 1302 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                      \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 1306 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 244 - Default for cluster: "General Commissioning", attribute: "FabricId". side: server, big-endian */\
+  1, 'o', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 252 - Default for cluster: "General Commissioning", attribute: "Breadcrumb". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 260 - Default for cluster: "Color Control", attribute: "compensation text". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 514 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 522 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 554 - Default for cluster: "Application Basic", attribute: "application name". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 586 - Default for cluster: "Application Basic", attribute: "application id". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 618 - Default for cluster: "Group Key Management", attribute: "groups". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 872 - Default for cluster: "Group Key Management", attribute: "group keys". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1126 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1158 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1190 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1222 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1238 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1302 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1306 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                               \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                    \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 244 - Default for cluster: "General Commissioning", attribute: "FabricId". side: server, little-endian */           \
-            1, 'o', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                            \
-                                                                                                                                   \
-            /* 252 - Default for cluster: "General Commissioning", attribute: "Breadcrumb". side: server, little-endian */         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 260 - Default for cluster: "Color Control", attribute: "compensation text". side: server, little-endian */          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 514 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, little-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 522 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, little-endian */            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 554 - Default for cluster: "Application Basic", attribute: "application name". side: server, little-endian */       \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 586 - Default for cluster: "Application Basic", attribute: "application id". side: server, little-endian */         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 618 - Default for cluster: "Group Key Management", attribute: "groups". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 872 - Default for cluster: "Group Key Management", attribute: "group keys". side: server, little-endian */          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 1126 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                        \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 1158 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                       \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 1190 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 1222 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 1238 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */             \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 1302 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                   \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 1306 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */             \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 244 - Default for cluster: "General Commissioning", attribute: "FabricId". side: server, little-endian */\
+  1, 'o', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 252 - Default for cluster: "General Commissioning", attribute: "Breadcrumb". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 260 - Default for cluster: "Color Control", attribute: "compensation text". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 514 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 522 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 554 - Default for cluster: "Application Basic", attribute: "application name". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 586 - Default for cluster: "Application Basic", attribute: "application id". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 618 - Default for cluster: "Group Key Management", attribute: "groups". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 872 - Default for cluster: "Group Key Management", attribute: "group keys". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1126 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1158 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1190 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1222 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1238 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1302 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 1306 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (23)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 127
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* Identify (server): cluster revision */                       \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_SIMPLE_DEFAULT(0x0000) },                                 /* Identify (server): identify time */                 \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Groups (server): cluster revision */                \
-            { 0x0000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },       /* Groups (server): name support */                    \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Scenes (server): cluster revision */                \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Scenes (server): scene count */                     \
-            { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Scenes (server): current scene */                   \
-            { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Scenes (server): current group */                   \
-            { 0x0003, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },  /* Scenes (server): scene valid */                     \
-            { 0x0004, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },       /* Scenes (server): name support */                    \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },      /* On/off (server): cluster revision */                \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },  /* On/off (server): on/off */                          \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Level Control (server): cluster revision */         \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Level Control (server): current level */            \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                      \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(0) },                                                      /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(32) },                                                     /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */                                                       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */                                                        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */                                          \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */                                                \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(180) },                                       /* Basic (server): SoftwareVersionString */    \
-            { 0x0000, ZAP_TYPE(OCTET_STRING), 8, 0, ZAP_LONG_DEFAULTS_INDEX(244) }, /* General Commissioning (server): FabricId */ \
-            { 0x0001, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_LONG_DEFAULTS_INDEX(252) },                               /* General Commissioning (server): Breadcrumb */       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* General Commissioning (server): cluster revision */ \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */ \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Door Lock (server): cluster revision */             \
-            { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(2) },       /* Door Lock (server): lock state */                   \
-            { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },         /* Door Lock (server): lock type */                    \
-            { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() },       /* Door Lock (server): actuator enabled */             \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (server): cluster revision */       \
-            { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },         /* Barrier Control (server): barrier moving state */   \
-            { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_EMPTY_DEFAULT() },      /* Barrier Control (server): barrier safety status */  \
-            { 0x0003, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },       /* Barrier Control (server): barrier capabilities */   \
-            { 0x000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },         /* Barrier Control (server): barrier position */       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Color Control (server): cluster revision */         \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Color Control (server): current hue */              \
-            { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Color Control (server): current saturation */       \
-            { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): remaining time */           \
-            { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* Color Control (server): current x */                \
-            { 0x0004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* Color Control (server): current y */                \
-            { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },         /* Color Control (server): drift compensation */       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 254, 0,                                                                               \
-              ZAP_LONG_DEFAULTS_INDEX(260) },                               /* Color Control (server): compensation text */        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* Color Control (server): color temperature */        \
-            { 0x0008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },    /* Color Control (server): color mode */               \
-            { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) },                            /* Color Control (server): color control options */           \
-            { 0x0010, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): number of primaries */             \
-            { 0x0011, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 x */                     \
-            { 0x0012, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 y */                     \
-            { 0x0013, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 1 intensity */             \
-            { 0x0015, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 x */                     \
-            { 0x0016, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 y */                     \
-            { 0x0017, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 2 intensity */             \
-            { 0x0019, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 x */                     \
-            { 0x001A, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 y */                     \
-            { 0x001B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 3 intensity */             \
-            { 0x0020, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 x */                     \
-            { 0x0021, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 y */                     \
-            { 0x0022, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 4 intensity */             \
-            { 0x0024, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 x */                     \
-            { 0x0025, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 y */                     \
-            { 0x0026, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 5 intensity */             \
-            { 0x0028, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 x */                     \
-            { 0x0029, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 y */                     \
-            { 0x002A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 6 intensity */             \
-            { 0x0030, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point x */                                                   \
-            { 0x0031, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point y */                                                   \
-            { 0x0032, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r x */                                                 \
-            { 0x0033, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r y */                                                 \
-            { 0x0034, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r intensity */                                         \
-            { 0x0036, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g x */                                                 \
-            { 0x0037, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g y */                                                 \
-            { 0x0038, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g intensity */                                         \
-            { 0x003A, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b x */                                                 \
-            { 0x003B, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b y */                                                 \
-            { 0x003C, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b intensity */                                         \
-            { 0x400D, ZAP_TYPE(INT16U), 2, 0,                                                                                      \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): couple color temp to level min-mireds */                           \
-            { 0x4010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): start up color temperature mireds */                               \
-            { 0x4000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },   /* Color Control (server): enhanced current hue */   \
-            { 0x4001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },      /* Color Control (server): enhanced color mode */    \
-            { 0x4002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* Color Control (server): color loop active */      \
-            { 0x4003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* Color Control (server): color loop direction */   \
-            { 0x4004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0019) },   /* Color Control (server): color loop time */        \
-            { 0x400A, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color capabilities */     \
-            { 0x400B, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color temp physical min */  \
-            { 0x400C, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFEFF) }, /* Color Control (server): color temp physical max */  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (server): cluster revision */    \
-            { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): measured value */ \
-            { 0x0001, ZAP_TYPE(INT16S), 2, 0,                                                                                      \
-              ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): min measured value */                             \
-            { 0x0002, ZAP_TYPE(INT16S), 2, 0,                                                                                      \
-              ZAP_SIMPLE_DEFAULT(0x8000) },                            /* Temperature Measurement (server): max measured value */  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* IAS Zone (server): cluster revision */                   \
-            { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* IAS Zone (server): zone state */                  \
-            { 0x0001, ZAP_TYPE(ENUM16), 2, 0, ZAP_EMPTY_DEFAULT() },          /* IAS Zone (server): zone type */                   \
-            { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* IAS Zone (server): zone status */                 \
-            { 0x0010, ZAP_TYPE(IEEE_ADDRESS), 8, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                     \
-              ZAP_LONG_DEFAULTS_INDEX(514) },                                        /* IAS Zone (server): IAS CIE address */      \
-            { 0x0011, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xff) },             /* IAS Zone (server): Zone ID */              \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) },          /* Low Power (server): cluster revision */    \
-            { 0x0000, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(522) }, /* Application Basic (server): vendor name */ \
-            { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },                 /* Application Basic (server): vendor id */   \
-            { 0x0002, ZAP_TYPE(OCTET_STRING), 32, 0,                                                                               \
-              ZAP_LONG_DEFAULTS_INDEX(554) },                               /* Application Basic (server): application name */     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (server): cluster revision */     \
-            { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },        /* Application Basic (server): product id */           \
-            { 0x0005, ZAP_TYPE(OCTET_STRING), 32, 0,                                                                               \
-              ZAP_LONG_DEFAULTS_INDEX(586) },                                  /* Application Basic (server): application id */    \
-            { 0x0006, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },           /* Application Basic (server): catalog vendor id */ \
-            { 0x0007, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },       /* Application Basic (server): application satus */ \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) },    /* Binding (server): cluster revision */            \
-            { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(618) }, /* Group Key Management (server): groups */         \
-            { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(872) }, /* Group Key Management (server): group keys */     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Group Key Management (server): cluster revision */  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },      /* On/off (server): cluster revision */                \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },  /* On/off (server): on/off */                          \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                      \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(1126) },                                                   /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(1158) },                                                   /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(1190) }, /* Basic (server): UserLabel */                                                     \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(1222) }, /* Basic (server): Location */                                                      \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(1238) }, /* Basic (server): HardwareVersionString */                                         \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(1302) }, /* Basic (server): SoftwareVersion */                                               \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(1306) }, /* Basic (server): SoftwareVersionString */                                         \
-    }
+#define GENERATED_ATTRIBUTE_COUNT 131
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* Identify (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* Identify (server): identify time */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Groups (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Groups (server): name support */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Scenes (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Scenes (server): scene count */  \
+  { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Scenes (server): current scene */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Scenes (server): current group */  \
+  { 0x0003, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Scenes (server): scene valid */  \
+  { 0x0004, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Scenes (server): name support */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): current level */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(32) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(180) }, /* Basic (server): SoftwareVersionString */  \
+  { 0x0000, ZAP_TYPE(OCTET_STRING), 8, 0, ZAP_LONG_DEFAULTS_INDEX(244) }, /* General Commissioning (server): FabricId */  \
+  { 0x0001, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(252) }, /* General Commissioning (server): Breadcrumb */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* General Commissioning (server): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* Door Lock (server): lock state */  \
+  { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Door Lock (server): lock type */  \
+  { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Door Lock (server): actuator enabled */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (server): cluster revision */  \
+  { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier moving state */  \
+  { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier safety status */  \
+  { 0x0003, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier capabilities */  \
+  { 0x000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier position */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Color Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): current hue */  \
+  { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): current saturation */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): remaining time */  \
+  { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* Color Control (server): current x */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* Color Control (server): current y */  \
+  { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): drift compensation */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 254, 0, ZAP_LONG_DEFAULTS_INDEX(260) }, /* Color Control (server): compensation text */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* Color Control (server): color temperature */  \
+  { 0x0008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* Color Control (server): color mode */  \
+  { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): color control options */  \
+  { 0x0010, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): number of primaries */  \
+  { 0x0011, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 x */  \
+  { 0x0012, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 y */  \
+  { 0x0013, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 intensity */  \
+  { 0x0015, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 x */  \
+  { 0x0016, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 y */  \
+  { 0x0017, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 intensity */  \
+  { 0x0019, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 x */  \
+  { 0x001A, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 y */  \
+  { 0x001B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 intensity */  \
+  { 0x0020, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 x */  \
+  { 0x0021, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 y */  \
+  { 0x0022, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 intensity */  \
+  { 0x0024, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 x */  \
+  { 0x0025, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 y */  \
+  { 0x0026, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 intensity */  \
+  { 0x0028, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 x */  \
+  { 0x0029, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 y */  \
+  { 0x002A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 intensity */  \
+  { 0x0030, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point x */  \
+  { 0x0031, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point y */  \
+  { 0x0032, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r x */  \
+  { 0x0033, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r y */  \
+  { 0x0034, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r intensity */  \
+  { 0x0036, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g x */  \
+  { 0x0037, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g y */  \
+  { 0x0038, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g intensity */  \
+  { 0x003A, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b x */  \
+  { 0x003B, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b y */  \
+  { 0x003C, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b intensity */  \
+  { 0x400D, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): couple color temp to level min-mireds */  \
+  { 0x4010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): start up color temperature mireds */  \
+  { 0x4000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): enhanced current hue */  \
+  { 0x4001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* Color Control (server): enhanced color mode */  \
+  { 0x4002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): color loop active */  \
+  { 0x4003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): color loop direction */  \
+  { 0x4004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0019) }, /* Color Control (server): color loop time */  \
+  { 0x400A, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color capabilities */  \
+  { 0x400B, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color temp physical min */  \
+  { 0x400C, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFEFF) }, /* Color Control (server): color temp physical max */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): measured value */  \
+  { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): min measured value */  \
+  { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): max measured value */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* Occupancy Sensing (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Occupancy Sensing (server): occupancy */  \
+  { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Occupancy Sensing (server): occupancy sensor type */  \
+  { 0x0002, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Occupancy Sensing (server): occupancy sensor type bitmap */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* IAS Zone (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* IAS Zone (server): zone state */  \
+  { 0x0001, ZAP_TYPE(ENUM16), 2, 0, ZAP_EMPTY_DEFAULT() }, /* IAS Zone (server): zone type */  \
+  { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* IAS Zone (server): zone status */  \
+  { 0x0010, ZAP_TYPE(IEEE_ADDRESS), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(514) }, /* IAS Zone (server): IAS CIE address */  \
+  { 0x0011, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xff) }, /* IAS Zone (server): Zone ID */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Low Power (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(522) }, /* Application Basic (server): vendor name */  \
+  { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Application Basic (server): vendor id */  \
+  { 0x0002, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(554) }, /* Application Basic (server): application name */  \
+  { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Application Basic (server): product id */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (server): cluster revision */  \
+  { 0x0005, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(586) }, /* Application Basic (server): application id */  \
+  { 0x0006, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Application Basic (server): catalog vendor id */  \
+  { 0x0007, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* Application Basic (server): application satus */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Binding (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(618) }, /* Group Key Management (server): groups */  \
+  { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(872) }, /* Group Key Management (server): group keys */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Group Key Management (server): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(1126) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(1158) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(1190) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(1222) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(1238) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(1302) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(1306) }, /* Basic (server): SoftwareVersionString */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
-    const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {                                                          \
-        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,                                                  \
-        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerAttributeChangedCallback,                                      \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = {                                                            \
-        (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback,                                                    \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {                                                            \
-        (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,                                                    \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
-        (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {                                                      \
-        (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,                                              \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayDoorLockServer[] = {                                                          \
-        (EmberAfGenericClusterFunction) emberAfDoorLockClusterServerAttributeChangedCallback,                                      \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayColorControlServer[] = {                                                      \
-        (EmberAfGenericClusterFunction) emberAfColorControlClusterServerInitCallback,                                              \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayIasZoneServer[] = {                                                           \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerInitCallback,                                                   \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerMessageSentCallback,                                            \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerPreAttributeChangedCallback,                                    \
-    };
-
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
-#define GENERATED_CLUSTER_COUNT 19
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003,                                                                                                                  \
-          ZAP_ATTRIBUTE_INDEX(0),                                                                                                  \
-          2,                                                                                                                       \
-          4,                                                                                                                       \
-          ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION),               \
-          chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */                                             \
-            { 0x0004,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(2),                                                                                              \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */                                             \
-            { 0x0005,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(4),                                                                                              \
-              6,                                                                                                                   \
-              8,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */                                             \
-            { 0x0006,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(10),                                                                                             \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */                                              \
-            { 0x0008,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(12),                                                                                             \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */                                \
-            {                                                                                                                      \
-                0x0028, ZAP_ATTRIBUTE_INDEX(14), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL                                           \
-            }, /* Endpoint: 1, Cluster: Basic (server) */                                                                          \
-            {                                                                                                                      \
-                0x0030, ZAP_ATTRIBUTE_INDEX(26), 3, 18, ZAP_CLUSTER_MASK(SERVER), NULL                                             \
-            }, /* Endpoint: 1, Cluster: General Commissioning (server) */                                                          \
-            {                                                                                                                      \
-                0x0031, ZAP_ATTRIBUTE_INDEX(29), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Network Commissioning (server) */                                                          \
-            { 0x0101,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(30),                                                                                             \
-              4,                                                                                                                   \
-              5,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION),                                             \
-              chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */                                        \
-            {                                                                                                                      \
-                0x0103, ZAP_ATTRIBUTE_INDEX(34), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Barrier Control (server) */                                                                \
-            { 0x0300,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(39),                                                                                             \
-              51,                                                                                                                  \
-              336,                                                                                                                 \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */                                \
-            {                                                                                                                      \
-                0x0402, ZAP_ATTRIBUTE_INDEX(90), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                        \
-            { 0x0500,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(94),                                                                                             \
-              6,                                                                                                                   \
-              16,                                                                                                                  \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) |      \
-                  ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION),                                                                         \
-              chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */                                          \
-            {                                                                                                                      \
-                0x0508, ZAP_ATTRIBUTE_INDEX(100), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                             \
-            }, /* Endpoint: 1, Cluster: Low Power (server) */                                                                      \
-            {                                                                                                                      \
-                0x050D, ZAP_ATTRIBUTE_INDEX(101), 8, 105, ZAP_CLUSTER_MASK(SERVER), NULL                                           \
-            }, /* Endpoint: 1, Cluster: Application Basic (server) */                                                              \
-            {                                                                                                                      \
-                0xF000, ZAP_ATTRIBUTE_INDEX(109), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                             \
-            }, /* Endpoint: 1, Cluster: Binding (server) */                                                                        \
-            {                                                                                                                      \
-                0xF004, ZAP_ATTRIBUTE_INDEX(110), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL                                           \
-            }, /* Endpoint: 1, Cluster: Group Key Management (server) */                                                           \
-            { 0x0006,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(113),                                                                                            \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/off (server) */                                              \
-            {                                                                                                                      \
-                0x0028, ZAP_ATTRIBUTE_INDEX(115), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL                                          \
-            }, /* Endpoint: 2, Cluster: Basic (server) */                                                                          \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_FUNCTION_ARRAYS   \
+const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,\
+  (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerAttributeChangedCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayDoorLockServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfDoorLockClusterServerAttributeChangedCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayColorControlServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfColorControlClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayOccupancySensingServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfOccupancySensingClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayIasZoneServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerInitCallback,\
+  (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerMessageSentCallback,\
+  (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerPreAttributeChangedCallback,\
+};\
+
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
+#define GENERATED_CLUSTER_COUNT 20
+#define GENERATED_CLUSTERS { \
+  { 0x0003, ZAP_ATTRIBUTE_INDEX(0), 2, 4, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \
+  { 0x0004, ZAP_ATTRIBUTE_INDEX(2), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \
+  { 0x0005, ZAP_ATTRIBUTE_INDEX(4), 6, 8, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(10), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(12), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(14), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Basic (server) */ \
+  { 0x0030, ZAP_ATTRIBUTE_INDEX(26), 3, 18, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: General Commissioning (server) */ \
+  { 0x0031, ZAP_ATTRIBUTE_INDEX(29), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Network Commissioning (server) */ \
+  { 0x0101, ZAP_ATTRIBUTE_INDEX(30), 4, 5, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \
+  { 0x0103, ZAP_ATTRIBUTE_INDEX(34), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \
+  { 0x0300, ZAP_ATTRIBUTE_INDEX(39), 51, 336, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \
+  { 0x0402, ZAP_ATTRIBUTE_INDEX(90), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
+  { 0x0406, ZAP_ATTRIBUTE_INDEX(94), 4, 5, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOccupancySensingServer }, /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
+  { 0x0500, ZAP_ATTRIBUTE_INDEX(98), 6, 16, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \
+  { 0x0508, ZAP_ATTRIBUTE_INDEX(104), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Low Power (server) */ \
+  { 0x050D, ZAP_ATTRIBUTE_INDEX(105), 8, 105, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Application Basic (server) */ \
+  { 0xF000, ZAP_ATTRIBUTE_INDEX(113), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Binding (server) */ \
+  { 0xF004, ZAP_ATTRIBUTE_INDEX(114), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Group Key Management (server) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(117), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/off (server) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(119), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 2, Cluster: Basic (server) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 17, 1286 }, { ZAP_CLUSTER_INDEX(17), 2, 257 },                                                     \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 18, 1291 }, \
+  { ZAP_CLUSTER_INDEX(18), 2, 257 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (255)
@@ -632,286 +408,197 @@
 #define ATTRIBUTE_SINGLETONS_SIZE (508)
 
 // Total size of attribute storage
-#define ATTRIBUTE_MAX_SIZE (1543)
+#define ATTRIBUTE_MAX_SIZE (1548)
 
 // Number of fixed endpoints
 #define FIXED_ENDPOINT_COUNT (2)
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0001, 0x0002                                                                                                             \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0001, 0x0002 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0103, 0x0103                                                                                                             \
-    }
+#define FIXED_PROFILE_IDS { 0x0103, 0x0103 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0, 0                                                                                                                       \
-    }
+#define FIXED_DEVICE_IDS { 0, 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1, 1                                                                                                                       \
-    }
+#define FIXED_DEVICE_VERSIONS { 1, 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0, 1                                                                                                                       \
-    }
+#define FIXED_ENDPOINT_TYPES { 0, 1 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        0, 0                                                                                                                       \
-    }
+#define FIXED_NETWORKS { 0, 0 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (117)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) },     /* Identify (server): Identify */                                 \
-            { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (server): IdentifyQueryResponse */                    \
-            { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (server): IdentifyQuery */                            \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroup */                                   \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): AddGroupResponse */                           \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): ViewGroup */                                  \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): ViewGroupResponse */                          \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): GetGroupMembership */                         \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): GetGroupMembershipResponse */                 \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveGroup */                                \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): RemoveGroupResponse */                        \
-            { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveAllGroups */                            \
-            { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroupIfIdentifying */                      \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): AddScene */                                   \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): AddSceneResponse */                           \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): ViewScene */                                  \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): ViewSceneResponse */                          \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveScene */                                \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveSceneResponse */                        \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveAllScenes */                            \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveAllScenesResponse */                    \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): StoreScene */                                 \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): StoreSceneResponse */                         \
-            { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RecallScene */                                \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): GetSceneMembership */                         \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): GetSceneMembershipResponse */                 \
-            { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */                                        \
-            { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */                                        \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */                         \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */                                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */                       \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Basic (server): MfgSpecificPing */                             \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0030, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (server): SetFabric */                   \
-            { 0x0030, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (server): SetFabricResponse */           \
-            { 0x0030, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (server): ArmFailSafe */                 \
-            { 0x0030, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (server): ArmFailSafeResponse */         \
-            { 0x0030, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (server): CommissioningComplete */       \
-            { 0x0030, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (server): CommissioningCompleteResponse */             \
-            { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */                \
-            { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */        \
-            { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */              \
-            { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */      \
-            { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */           \
-            { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */   \
-            { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */            \
-            { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */    \
-            { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */         \
-            { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
-            { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */               \
-            { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */       \
-            { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */               \
-            { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */       \
-            { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */              \
-            { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */      \
-            { 0x0031, 0x10,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */         \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): LockDoor */                                \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): LockDoorResponse */                        \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): UnlockDoor */                              \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): UnlockDoorResponse */                      \
-            { 0x0101, 0x03,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): UnlockWithTimeout */ \
-            { 0x0101, 0x04,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetLogRecord */      \
-            { 0x0101, 0x05,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetPin */            \
-            { 0x0101, 0x06,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetPin */            \
-            { 0x0101, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearPin */          \
-            { 0x0101, 0x08,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllPins */      \
-            {                                                                                                                      \
-                0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): SetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): GetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): ClearWeekdaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): SetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): GetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): ClearYeardaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): SetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): GetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): ClearHolidaySchedule */                                                                      \
-            { 0x0101, 0x14,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetUserType */       \
-            { 0x0101, 0x15,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetUserType */       \
-            { 0x0101, 0x16,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetRfid */           \
-            { 0x0101, 0x17,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetRfid */           \
-            { 0x0101, 0x18,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearRfid */         \
-            { 0x0101, 0x19,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllRfids */     \
-            { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlGoToPercent */         \
-            { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlStop */                \
-            { 0x0300, 0x00,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToHue */     \
-            { 0x0300, 0x01,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveHue */       \
-            { 0x0300, 0x02,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepHue */       \
-            {                                                                                                                      \
-                0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveToSaturation */                                                                      \
-            {                                                                                                                      \
-                0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): StepSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            },                                                   /* Color Control (server): MoveToHueAndSaturation */              \
-            { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveToColor */                         \
-            { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveColor */                           \
-            { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): StepColor */                           \
-            {                                                                                                                      \
-                0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveToColorTemperature */                                                                \
-            { 0x0300, 0x47,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StopMoveStep */  \
-            {                                                                                                                      \
-                0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveColorTemperature */                                                                  \
-            {                                                                                                                      \
-                0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            },                                                   /* Color Control (server): StepColorTemperature */                \
-            { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* IAS Zone (server): ZoneEnrollResponse */                       \
-            { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneStatusChangeNotification */             \
-            { 0x0500, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneEnrollRequest */                        \
-            { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (server): Sleep */                                   \
-            { 0xF000, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (server): Bind */                                      \
-            { 0xF000, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (server): Unbind */                                    \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (server): Identify */ \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (server): IdentifyQueryResponse */ \
+  { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (server): IdentifyQuery */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroup */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): AddGroupResponse */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): ViewGroup */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): ViewGroupResponse */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): GetGroupMembership */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): GetGroupMembershipResponse */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveGroup */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): RemoveGroupResponse */ \
+  { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveAllGroups */ \
+  { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroupIfIdentifying */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): AddScene */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): AddSceneResponse */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): ViewScene */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): ViewSceneResponse */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveScene */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveSceneResponse */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveAllScenes */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveAllScenesResponse */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): StoreScene */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): StoreSceneResponse */ \
+  { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RecallScene */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): GetSceneMembership */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): GetSceneMembershipResponse */ \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Basic (server): MfgSpecificPing */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0030, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (server): SetFabric */ \
+  { 0x0030, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (server): SetFabricResponse */ \
+  { 0x0030, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (server): ArmFailSafe */ \
+  { 0x0030, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (server): ArmFailSafeResponse */ \
+  { 0x0030, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (server): CommissioningComplete */ \
+  { 0x0030, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (server): CommissioningCompleteResponse */ \
+  { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */ \
+  { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */ \
+  { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */ \
+  { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */ \
+  { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */ \
+  { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */ \
+  { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */ \
+  { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */ \
+  { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */ \
+  { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
+  { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */ \
+  { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */ \
+  { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */ \
+  { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */ \
+  { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */ \
+  { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */ \
+  { 0x0031, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): LockDoor */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): LockDoorResponse */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): UnlockDoor */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): UnlockDoorResponse */ \
+  { 0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): UnlockWithTimeout */ \
+  { 0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetLogRecord */ \
+  { 0x0101, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetPin */ \
+  { 0x0101, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetPin */ \
+  { 0x0101, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearPin */ \
+  { 0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllPins */ \
+  { 0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetWeekdaySchedule */ \
+  { 0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetWeekdaySchedule */ \
+  { 0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearWeekdaySchedule */ \
+  { 0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetYeardaySchedule */ \
+  { 0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetYeardaySchedule */ \
+  { 0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearYeardaySchedule */ \
+  { 0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetHolidaySchedule */ \
+  { 0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetHolidaySchedule */ \
+  { 0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearHolidaySchedule */ \
+  { 0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetUserType */ \
+  { 0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetUserType */ \
+  { 0x0101, 0x16, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetRfid */ \
+  { 0x0101, 0x17, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetRfid */ \
+  { 0x0101, 0x18, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearRfid */ \
+  { 0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllRfids */ \
+  { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlGoToPercent */ \
+  { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlStop */ \
+  { 0x0300, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToHue */ \
+  { 0x0300, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveHue */ \
+  { 0x0300, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepHue */ \
+  { 0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToSaturation */ \
+  { 0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveSaturation */ \
+  { 0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepSaturation */ \
+  { 0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToHueAndSaturation */ \
+  { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveToColor */ \
+  { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveColor */ \
+  { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): StepColor */ \
+  { 0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToColorTemperature */ \
+  { 0x0300, 0x47, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StopMoveStep */ \
+  { 0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveColorTemperature */ \
+  { 0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepColorTemperature */ \
+  { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* IAS Zone (server): ZoneEnrollResponse */ \
+  { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneStatusChangeNotification */ \
+  { 0x0500, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneEnrollRequest */ \
+  { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (server): Sleep */ \
+  { 0xF000, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (server): Bind */ \
+  { 0xF000, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (server): Unbind */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (1)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        { 40, 4098 },                                                                                                              \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 40, 4098 },\
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
-#define EMBER_AF_PLUGIN_REPORTING_TABLE_SIZE (10)
+#define EMBER_AF_PLUGIN_REPORTING_TABLE_SIZE (11)
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (10)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }          \
-        }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */                                                \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */                              \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0101, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Door Lock", attribute: "lock state". side: server */                                     \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current hue". side: server */                                \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0001, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current saturation". side: server */                         \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0003, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current x". side: server */                                  \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0004, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current y". side: server */                                  \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0007, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "color temperature". side: server */                          \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0402, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Temperature Measurement", attribute: "measured value". side: server */                   \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0002, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */                                            \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (11)
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0101, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Door Lock", attribute: "lock state". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current hue". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0001, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current saturation". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0003, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current x". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0004, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current y". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0007, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "color temperature". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0402, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Temperature Measurement", attribute: "measured value". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0406, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Occupancy Sensing", attribute: "occupancy". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0002, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */ \
+}
+
+
diff --git a/examples/all-clusters-app/all-clusters-common/gen/enums.h b/examples/all-clusters-app/all-clusters-common/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/enums.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/examples/all-clusters-app/all-clusters-common/gen/gen_config.h b/examples/all-clusters-app/all-clusters-common/gen/gen_config.h
index 4b14a4f05c80b9..98f3e3054cc47a 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/gen_config.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
@@ -43,6 +44,7 @@
 #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2)
 #define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -129,6 +131,11 @@
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_NETWORK_COMMISSIONING
 
+// Use this macro to check if the server side of the Occupancy Sensing cluster is included
+#define ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING_SERVER
+#define EMBER_AF_PLUGIN_OCCUPANCY_SENSING
+
 // Use this macro to check if the server side of the On/off cluster is included
 #define ZCL_USING_ON_OFF_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ON_OFF_SERVER
diff --git a/examples/all-clusters-app/all-clusters-common/gen/print-cluster.h b/examples/all-clusters-app/all-clusters-common/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/examples/all-clusters-app/all-clusters-common/gen/print-cluster.h
+++ b/examples/all-clusters-app/all-clusters-common/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52
diff --git a/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.cpp b/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.cpp
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.cpp
+++ b/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.cpp
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.h b/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.h
+++ b/examples/bridge-app/bridge-common/gen/CHIPClientCallbacks.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.h b/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.h
+++ b/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.mm b/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.mm
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.mm
+++ b/examples/bridge-app/bridge-common/gen/CHIPClustersObjc.mm
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp
index 677745206f2135..e6fe3b8a9ea74b 100644
--- a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp
+++ b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,699 +47,685 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_MOVE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists             = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_STEP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
         }
-        case ZCL_STOP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+        case ZCL_STOP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfLevelControlClusterStopWithOnOffCallback();
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
+        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopWithOnOffCallback();
+                    break;
+        }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
@@ -750,7 +736,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace LevelControl
+}
 
 namespace NetworkCommissioning {
 
@@ -760,907 +746,889 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan NetworkID;
-            bool NetworkIDExists = false;
-            uint64_t Breadcrumb;
-            bool BreadcrumbExists = false;
-            uint32_t TimeoutMs;
-            bool TimeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (NetworkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        NetworkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        NetworkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (BreadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(Breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        BreadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (TimeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(TimeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        TimeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan NetworkID;
+bool NetworkIDExists = false;
+uint64_t Breadcrumb;
+bool BreadcrumbExists = false;
+uint32_t TimeoutMs;
+bool TimeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (NetworkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        NetworkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            NetworkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (BreadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(Breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            BreadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (TimeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(TimeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            TimeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         default: {
@@ -1673,7 +1641,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace NetworkCommissioning
+}
 
 namespace OnOff {
 
@@ -1683,22 +1651,22 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOffCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOffCallback();
+                    break;
         }
         case ZCL_ON_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOnCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOnCallback();
+                    break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterToggleCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterToggleCallback();
+                    break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
@@ -1710,25 +1678,26 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace OnOff
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+    case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+    case ZCL_ON_OFF_CLUSTER_ID :
         clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
     default:
diff --git a/examples/bridge-app/bridge-common/gen/af-structs.h b/examples/bridge-app/bridge-common/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/examples/bridge-app/bridge-common/gen/af-structs.h
+++ b/examples/bridge-app/bridge-common/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/examples/bridge-app/bridge-common/gen/attribute-id.h b/examples/bridge-app/bridge-common/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/examples/bridge-app/bridge-common/gen/attribute-id.h
+++ b/examples/bridge-app/bridge-common/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/examples/bridge-app/bridge-common/gen/attribute-size.h b/examples/bridge-app/bridge-common/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/examples/bridge-app/bridge-common/gen/attribute-size.h
+++ b/examples/bridge-app/bridge-common/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/examples/bridge-app/bridge-common/gen/attribute-type.h b/examples/bridge-app/bridge-common/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/examples/bridge-app/bridge-common/gen/attribute-type.h
+++ b/examples/bridge-app/bridge-common/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/examples/bridge-app/bridge-common/gen/call-command-handler.cpp b/examples/bridge-app/bridge-common/gen/call-command-handler.cpp
index 7367eb75cbe371..4cda0328084127 100644
--- a/examples/bridge-app/bridge-common/gen/call-command-handler.cpp
+++ b/examples/bridge-app/bridge-common/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -33,6 +33,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
 EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -53,6 +54,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -72,17 +74,17 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        case ZCL_LEVEL_CONTROL_CLUSTER_ID :
             result = emberAfLevelControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
             result = emberAfNetworkCommissioningClusterServerCommandParse(cmd);
             break;
-        case ZCL_ON_OFF_CLUSTER_ID:
+        case ZCL_ON_OFF_CLUSTER_ID :
             result = emberAfOnOffClusterServerCommandParse(cmd);
             break;
         default:
@@ -104,203 +106,203 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
         switch (cmd->commandId)
         {
         case ZCL_MOVE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
             break;
         }
         case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
             break;
         }
         case ZCL_STEP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
             break;
         }
         case ZCL_STOP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
             break;
         }
         case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
-            wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
+        wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
             break;
         }
         default: {
@@ -320,276 +322,276 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan NetworkID;
-            uint64_t Breadcrumb;
-            uint32_t TimeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                NetworkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            Breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan NetworkID;
+uint64_t Breadcrumb;
+uint32_t TimeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  NetworkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  Breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         default: {
@@ -609,15 +611,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd)
         switch (cmd->commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOffCallback();
+        wasHandled = emberAfOnOffClusterOffCallback();
             break;
         }
         case ZCL_ON_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOnCallback();
+        wasHandled = emberAfOnOffClusterOnCallback();
             break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterToggleCallback();
+        wasHandled = emberAfOnOffClusterToggleCallback();
             break;
         }
         default: {
diff --git a/examples/bridge-app/bridge-common/gen/callback-stub.cpp b/examples/bridge-app/bridge-common/gen/callback-stub.cpp
index d54f58e89049d4..ce090ca11ca60b 100644
--- a/examples/bridge-app/bridge-common/gen/callback-stub.cpp
+++ b/examples/bridge-app/bridge-common/gen/callback-stub.cpp
@@ -29,16 +29,16 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+     case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+     case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         emberAfNetworkCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+     case ZCL_ON_OFF_CLUSTER_ID :
         emberAfOnOffClusterInitCallback(endpoint);
         break;
     default:
@@ -132,9 +132,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -149,8 +150,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -165,8 +167,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -183,7 +186,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -200,7 +204,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -217,7 +222,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -242,8 +248,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -262,9 +269,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -283,9 +290,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -303,7 +310,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -327,7 +335,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -350,9 +359,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -374,9 +384,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -396,10 +407,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -412,7 +425,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -453,9 +467,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -471,7 +486,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -522,9 +538,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -540,7 +557,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -576,8 +594,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -612,8 +631,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/examples/bridge-app/bridge-common/gen/callback.h b/examples/bridge-app/bridge-common/gen/callback.h
index b47ae316a9a3e6..2609e51616c6a3 100644
--- a/examples/bridge-app/bridge-common/gen/callback.h
+++ b/examples/bridge-app/bridge-common/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Level Control Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Network Commissioning Cluster Init
  *
  * Cluster Init
@@ -63,6 +66,7 @@ void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief On/off Cluster Init
  *
  * Cluster Init
@@ -71,8 +75,10 @@ void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Basic Cluster server
 //
@@ -102,8 +108,7 @@ void emberAfBasicClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Server Message Sent
  *
@@ -116,8 +121,7 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Server Pre Attribute Changed
  *
@@ -129,9 +133,7 @@ void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Server Tick
  *
@@ -170,9 +172,7 @@ void emberAfLevelControlClusterServerAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Level Control Cluster Server Message Sent
  *
@@ -185,9 +185,7 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Level Control Cluster Server Pre Attribute Changed
  *
@@ -199,9 +197,7 @@ void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Level Control Cluster Server Tick
  *
@@ -240,9 +236,7 @@ void emberAfNetworkCommissioningClusterServerAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Network Commissioning Cluster Server Message Sent
  *
@@ -255,9 +249,7 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Network Commissioning Cluster Server Pre Attribute Changed
  *
@@ -269,10 +261,7 @@ void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Network Commissioning Cluster Server Tick
  *
@@ -311,8 +300,7 @@ void emberAfOnOffClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief On/off Cluster Server Message Sent
  *
@@ -325,8 +313,7 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief On/off Cluster Server Pre Attribute Changed
  *
@@ -338,9 +325,7 @@ void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief On/off Cluster Server Tick
  *
@@ -353,180 +338,175 @@ void emberAfOnOffClusterServerTickCallback(chip::EndpointId endpoint);
 // Cluster Commands Callback
 
 /**
- * @brief Level Control Cluster Move Command callback
- * @param moveMode
- * @param rate
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Move Command callback
+* @param moveMode
+* @param rate
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevel Command callback
- * @param level
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster MoveToLevel Command callback
+* @param level
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask,
-                                                   uint8_t optionOverride);
+bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevelWithOnOff Command callback
- * @param level
- * @param transitionTime
- */
+* @brief Level Control Cluster MoveToLevelWithOnOff Command callback
+* @param level
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster MoveWithOnOff Command callback
- * @param moveMode
- * @param rate
- */
+* @brief Level Control Cluster MoveWithOnOff Command callback
+* @param moveMode
+* @param rate
+*/
 
 bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate);
 
 /**
- * @brief Level Control Cluster Step Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Step Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask,
-                                            uint8_t optionOverride);
+bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StepWithOnOff Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- */
+* @brief Level Control Cluster StepWithOnOff Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster Stop Command callback
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Stop Command callback
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StopWithOnOff Command callback
- */
+* @brief Level Control Cluster StopWithOnOff Command callback
+*/
 
 bool emberAfLevelControlClusterStopWithOnOffCallback();
 
 /**
- * @brief Network Commissioning Cluster AddThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster AddWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb,
-                                                              uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster DisableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster DisableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster EnableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster EnableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster RemoveNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster RemoveNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs);
 
 /**
- * @brief Network Commissioning Cluster ScanNetworks Command callback
- * @param ssid
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster ScanNetworks Command callback
+* @param ssid
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                   uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                 uint64_t breadcrumb, uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief On/off Cluster Off Command callback
- */
+* @brief On/off Cluster Off Command callback
+*/
 
 bool emberAfOnOffClusterOffCallback();
 
 /**
- * @brief On/off Cluster On Command callback
- */
+* @brief On/off Cluster On Command callback
+*/
 
 bool emberAfOnOffClusterOnCallback();
 
 /**
- * @brief On/off Cluster Toggle Command callback
- */
+* @brief On/off Cluster Toggle Command callback
+*/
 
 bool emberAfOnOffClusterToggleCallback();
 
+
 //
 // Non-Cluster Related Callbacks
 //
@@ -683,8 +663,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -703,6 +683,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -720,6 +701,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -813,8 +795,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -973,8 +955,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/examples/bridge-app/bridge-common/gen/client-command-macro.h b/examples/bridge-app/bridge-common/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/examples/bridge-app/bridge-common/gen/client-command-macro.h
+++ b/examples/bridge-app/bridge-common/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/examples/bridge-app/bridge-common/gen/cluster-id.h b/examples/bridge-app/bridge-common/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/examples/bridge-app/bridge-common/gen/cluster-id.h
+++ b/examples/bridge-app/bridge-common/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/examples/bridge-app/bridge-common/gen/command-id.h b/examples/bridge-app/bridge-common/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/examples/bridge-app/bridge-common/gen/command-id.h
+++ b/examples/bridge-app/bridge-common/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/examples/bridge-app/bridge-common/gen/endpoint_config.h b/examples/bridge-app/bridge-common/gen/endpoint_config.h
index 5e806ff23082be..dfbb61734f1cea 100644
--- a/examples/bridge-app/bridge-common/gen/endpoint_config.h
+++ b/examples/bridge-app/bridge-common/gen/endpoint_config.h
@@ -20,324 +20,219 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                                  \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                       \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 244 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 276 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 308 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                             \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 340 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 356 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 420 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                       \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 424 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 244 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 276 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 308 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 340 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 356 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 420 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 424 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                               \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                    \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 244 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 276 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                        \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 308 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 340 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 356 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 420 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                    \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 424 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 244 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 276 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 308 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 340 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 356 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 420 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 424 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (14)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT 51
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) },    /* Network Commissioning (server): cluster revision */  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },     /* On/off (server): cluster revision */                 \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */                           \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },     /* Level Control (server): cluster revision */          \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },   /* Level Control (server): current level */             \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                      \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(0) },                                                      /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(32) },                                                     /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */                                                       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */                                                        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */                                          \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */                                                \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(180) },                              /* Basic (server): SoftwareVersionString */             \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },     /* On/off (server): cluster revision */                 \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */                           \
-            { 0x4003, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() },                                       /* On/off (server): start up on off */                  \
-            { 0x4000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* On/off (server): global scene control */             \
-            { 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_SIMPLE_DEFAULT(0x0000) }, /* On/off (server): on time */                                                         \
-            { 0x4002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_SIMPLE_DEFAULT(0x0000) },                                 /* On/off (server): off wait time */                   \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Level Control (server): cluster revision */         \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Level Control (server): current level */            \
-            { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Level Control (server): remaining time */           \
-            { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): options */                                                    \
-            { 0x4000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Level Control (server): start up current level */                                          \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                      \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(244) },                                                    /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(276) },                                                    /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(308) }, /* Basic (server): UserLabel */                                                      \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(340) }, /* Basic (server): Location */                                                       \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(356) }, /* Basic (server): HardwareVersionString */                                          \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(420) }, /* Basic (server): SoftwareVersion */                                                \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(424) },                              /* Basic (server): SoftwareVersionString */             \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },     /* On/off (server): cluster revision */                 \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */                           \
-            { 0x4003, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() },                                       /* On/off (server): start up on off */                  \
-            { 0x4000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* On/off (server): global scene control */             \
-            { 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_SIMPLE_DEFAULT(0x0000) }, /* On/off (server): on time */                                                         \
-            { 0x4002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_SIMPLE_DEFAULT(0x0000) },                                 /* On/off (server): off wait time */                   \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Level Control (server): cluster revision */         \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Level Control (server): current level */            \
-            { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Level Control (server): remaining time */           \
-            { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): options */                                                    \
-            { 0x4000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Level Control (server): start up current level */                                          \
-    }
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): current level */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(32) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(180) }, /* Basic (server): SoftwareVersionString */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0x4003, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* On/off (server): start up on off */  \
+  { 0x4000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* On/off (server): global scene control */  \
+  { 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* On/off (server): on time */  \
+  { 0x4002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* On/off (server): off wait time */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): current level */  \
+  { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Level Control (server): remaining time */  \
+  { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): options */  \
+  { 0x4000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Level Control (server): start up current level */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(244) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(276) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(308) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(340) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(356) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(420) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(424) }, /* Basic (server): SoftwareVersionString */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0x4003, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* On/off (server): start up on off */  \
+  { 0x4000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* On/off (server): global scene control */  \
+  { 0x4001, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* On/off (server): on time */  \
+  { 0x4002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* On/off (server): off wait time */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): current level */  \
+  { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Level Control (server): remaining time */  \
+  { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): options */  \
+  { 0x4000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Level Control (server): start up current level */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
-    const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
-        (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {                                                      \
-        (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,                                              \
-    };
-
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+#define GENERATED_FUNCTION_ARRAYS   \
+const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,\
+};\
+
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT 9
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x0031, ZAP_ATTRIBUTE_INDEX(0), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                                   \
-        }, /* Endpoint: 0, Cluster: Network Commissioning (server) */                                                              \
-            { 0x0006,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(1),                                                                                              \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */                                              \
-            { 0x0008,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(3),                                                                                              \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */                                \
-            {                                                                                                                      \
-                0x0028, ZAP_ATTRIBUTE_INDEX(5), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL                                            \
-            }, /* Endpoint: 1, Cluster: Basic (server) */                                                                          \
-            { 0x0006,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(17),                                                                                             \
-              6,                                                                                                                   \
-              9,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/off (server) */                                              \
-            { 0x0008,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(23),                                                                                             \
-              5,                                                                                                                   \
-              7,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayLevelControlServer }, /* Endpoint: 2, Cluster: Level Control (server) */                                \
-            {                                                                                                                      \
-                0x0028, ZAP_ATTRIBUTE_INDEX(28), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL                                           \
-            }, /* Endpoint: 2, Cluster: Basic (server) */                                                                          \
-            { 0x0006,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(40),                                                                                             \
-              6,                                                                                                                   \
-              9,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayOnOffServer }, /* Endpoint: 3, Cluster: On/off (server) */                                              \
-            { 0x0008,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(46),                                                                                             \
-              5,                                                                                                                   \
-              7,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayLevelControlServer }, /* Endpoint: 3, Cluster: Level Control (server) */                                \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_CLUSTERS { \
+  { 0x0031, ZAP_ATTRIBUTE_INDEX(0), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(1), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(3), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(5), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Basic (server) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(17), 6, 9, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 2, Cluster: On/off (server) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(23), 5, 7, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayLevelControlServer }, /* Endpoint: 2, Cluster: Level Control (server) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(28), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 2, Cluster: Basic (server) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(40), 6, 9, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 3, Cluster: On/off (server) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(46), 5, 7, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayLevelControlServer }, /* Endpoint: 3, Cluster: Level Control (server) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 1, 2 }, { ZAP_CLUSTER_INDEX(1), 3, 260 }, { ZAP_CLUSTER_INDEX(4), 3, 270 },                        \
-            { ZAP_CLUSTER_INDEX(7), 2, 16 },                                                                                       \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 1, 2 }, \
+  { ZAP_CLUSTER_INDEX(1), 3, 260 }, \
+  { ZAP_CLUSTER_INDEX(4), 3, 270 }, \
+  { ZAP_CLUSTER_INDEX(7), 2, 16 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (65)
@@ -353,140 +248,116 @@
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0000, 0x0001, 0x0002, 0x0003                                                                                             \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0000, 0x0001, 0x0002, 0x0003 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0xABCD, 0x0104, 0x0104, 0x0104                                                                                             \
-    }
+#define FIXED_PROFILE_IDS { 0xABCD, 0x0104, 0x0104, 0x0104 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0, 0, 0, 0                                                                                                                 \
-    }
+#define FIXED_DEVICE_IDS { 0, 0, 0, 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1, 1, 1, 1                                                                                                                 \
-    }
+#define FIXED_DEVICE_VERSIONS { 1, 1, 1, 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0, 1, 2, 3                                                                                                                 \
-    }
+#define FIXED_ENDPOINT_TYPES { 0, 1, 2, 3 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        0, 0, 0, 0                                                                                                                 \
-    }
+#define FIXED_NETWORKS { 0, 0, 0, 0 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (62)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) },     /* On/off (server): Off */                                        \
-            { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */                                        \
-            { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */                                        \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0006, 0x40, 0 },                                 /* On/off (server): OffWithEffect */                              \
-            { 0x0006, 0x40, 0 },                                 /* On/off (server): OffWithEffect */                              \
-            { 0x0006, 0x41, 0 },                                 /* On/off (server): OnWithRecallGlobalScene */                    \
-            { 0x0006, 0x41, 0 },                                 /* On/off (server): OnWithRecallGlobalScene */                    \
-            { 0x0006, 0x42, 0 },                                 /* On/off (server): OnWithTimedOff */                             \
-            { 0x0006, 0x42, 0 },                                 /* On/off (server): OnWithTimedOff */                             \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */                         \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */                         \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */                         \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */                                \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */                                \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */                                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */                       \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */                       \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */                       \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */                \
-            { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */        \
-            { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */              \
-            { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */      \
-            { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */           \
-            { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */   \
-            { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */            \
-            { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */    \
-            { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */         \
-            { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
-            { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */               \
-            { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */       \
-            { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */               \
-            { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */       \
-            { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */              \
-            { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */      \
-            { 0x0031, 0x10,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */         \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0006, 0x40, 0 }, /* On/off (server): OffWithEffect */ \
+  { 0x0006, 0x40, 0 }, /* On/off (server): OffWithEffect */ \
+  { 0x0006, 0x41, 0 }, /* On/off (server): OnWithRecallGlobalScene */ \
+  { 0x0006, 0x41, 0 }, /* On/off (server): OnWithRecallGlobalScene */ \
+  { 0x0006, 0x42, 0 }, /* On/off (server): OnWithTimedOff */ \
+  { 0x0006, 0x42, 0 }, /* On/off (server): OnWithTimedOff */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */ \
+  { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */ \
+  { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */ \
+  { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */ \
+  { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */ \
+  { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */ \
+  { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */ \
+  { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */ \
+  { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */ \
+  { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
+  { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */ \
+  { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */ \
+  { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */ \
+  { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */ \
+  { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */ \
+  { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */ \
+  { 0x0031, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
@@ -494,12 +365,9 @@
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
 #define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (2)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }          \
-        }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */                                                \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */                              \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */ \
+}
+
+
diff --git a/examples/bridge-app/bridge-common/gen/enums.h b/examples/bridge-app/bridge-common/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/examples/bridge-app/bridge-common/gen/enums.h
+++ b/examples/bridge-app/bridge-common/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/examples/bridge-app/bridge-common/gen/gen_config.h b/examples/bridge-app/bridge-common/gen/gen_config.h
index d5a44941d9a09b..9bc94f29cc51a3 100644
--- a/examples/bridge-app/bridge-common/gen/gen_config.h
+++ b/examples/bridge-app/bridge-common/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
diff --git a/examples/bridge-app/bridge-common/gen/print-cluster.h b/examples/bridge-app/bridge-common/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/examples/bridge-app/bridge-common/gen/print-cluster.h
+++ b/examples/bridge-app/bridge-common/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52
diff --git a/examples/chip-tool/commands/clusters/Commands.h b/examples/chip-tool/commands/clusters/Commands.h
index 496166d4251e14..0d4cf0058f31d1 100644
--- a/examples/chip-tool/commands/clusters/Commands.h
+++ b/examples/chip-tool/commands/clusters/Commands.h
@@ -92,7 +92,7 @@ static void OnInt16sAttributeResponse(void * context, int16_t value)
 
 static void OnStringAttributeResponse(void * context, const chip::ByteSpan value)
 {
-    char * str = (char *) malloc(value.size() * sizeof(char));
+    char * str = (char *)malloc(value.size() * sizeof(char));
     memmove(str, value.data(), value.size());
     str[value.size()] = '\0';
     free(str);
@@ -159,8 +159,7 @@ static void OnDoorLockClusterClearYeardayScheduleResponse(void * context)
     command->SetCommandExitStatus(true);
 }
 
-static void OnDoorLockClusterGetHolidayScheduleResponse(void * context, uint8_t scheduleId, uint32_t localStartTime,
-                                                        uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+static void OnDoorLockClusterGetHolidayScheduleResponse(void * context, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
 {
     ChipLogProgress(chipTool, "DoorLockClusterGetHolidayScheduleResponse");
 
@@ -168,8 +167,7 @@ static void OnDoorLockClusterGetHolidayScheduleResponse(void * context, uint8_t
     command->SetCommandExitStatus(true);
 }
 
-static void OnDoorLockClusterGetLogRecordResponse(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType,
-                                                  uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
+static void OnDoorLockClusterGetLogRecordResponse(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
 {
     ChipLogProgress(chipTool, "DoorLockClusterGetLogRecordResponse");
 
@@ -201,8 +199,7 @@ static void OnDoorLockClusterGetUserTypeResponse(void * context, uint16_t userId
     command->SetCommandExitStatus(true);
 }
 
-static void OnDoorLockClusterGetWeekdayScheduleResponse(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask,
-                                                        uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+static void OnDoorLockClusterGetWeekdayScheduleResponse(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     ChipLogProgress(chipTool, "DoorLockClusterGetWeekdayScheduleResponse");
 
@@ -210,8 +207,7 @@ static void OnDoorLockClusterGetWeekdayScheduleResponse(void * context, uint8_t
     command->SetCommandExitStatus(true);
 }
 
-static void OnDoorLockClusterGetYeardayScheduleResponse(void * context, uint8_t scheduleId, uint16_t userId,
-                                                        uint32_t localStartTime, uint32_t localEndTime)
+static void OnDoorLockClusterGetYeardayScheduleResponse(void * context, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime)
 {
     ChipLogProgress(chipTool, "DoorLockClusterGetYeardayScheduleResponse");
 
@@ -323,8 +319,7 @@ static void OnGroupsClusterAddGroupResponse(void * context, uint16_t groupId)
     command->SetCommandExitStatus(true);
 }
 
-static void OnGroupsClusterGetGroupMembershipResponse(void * context, uint8_t capacity, uint8_t groupCount,
-                                                      /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
+static void OnGroupsClusterGetGroupMembershipResponse(void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList)
 {
     ChipLogProgress(chipTool, "GroupsClusterGetGroupMembershipResponse");
 
@@ -364,8 +359,7 @@ static void OnScenesClusterAddSceneResponse(void * context, uint16_t groupId, ui
     command->SetCommandExitStatus(true);
 }
 
-static void OnScenesClusterGetSceneMembershipResponse(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-                                                      /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
+static void OnScenesClusterGetSceneMembershipResponse(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList)
 {
     ChipLogProgress(chipTool, "ScenesClusterGetSceneMembershipResponse");
 
@@ -397,9 +391,7 @@ static void OnScenesClusterStoreSceneResponse(void * context, uint16_t groupId,
     command->SetCommandExitStatus(true);
 }
 
-static void OnScenesClusterViewSceneResponse(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                             uint8_t * sceneName,
-                                             /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
+static void OnScenesClusterViewSceneResponse(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
 {
     ChipLogProgress(chipTool, "ScenesClusterViewSceneResponse");
 
@@ -407,6 +399,7 @@ static void OnScenesClusterViewSceneResponse(void * context, uint16_t groupId, u
     command->SetCommandExitStatus(true);
 }
 
+
 /*----------------------------------------------------------------------------*\
 | Cluster Name                                                        |   ID   |
 |---------------------------------------------------------------------+--------|
@@ -426,19 +419,19 @@ static void OnScenesClusterViewSceneResponse(void * context, uint16_t groupId, u
 | TemperatureMeasurement                                              | 0x0402 |
 \*----------------------------------------------------------------------------*/
 
-constexpr chip::ClusterId kApplicationBasicClusterId       = 0x050D;
-constexpr chip::ClusterId kBarrierControlClusterId         = 0x0103;
-constexpr chip::ClusterId kBasicClusterId                  = 0x0028;
-constexpr chip::ClusterId kBindingClusterId                = 0xF000;
-constexpr chip::ClusterId kColorControlClusterId           = 0x0300;
-constexpr chip::ClusterId kDoorLockClusterId               = 0x0101;
-constexpr chip::ClusterId kGeneralCommissioningClusterId   = 0x0030;
-constexpr chip::ClusterId kGroupsClusterId                 = 0x0004;
-constexpr chip::ClusterId kIdentifyClusterId               = 0x0003;
-constexpr chip::ClusterId kLevelControlClusterId           = 0x0008;
-constexpr chip::ClusterId kLowPowerClusterId               = 0x0508;
-constexpr chip::ClusterId kOnOffClusterId                  = 0x0006;
-constexpr chip::ClusterId kScenesClusterId                 = 0x0005;
+constexpr chip::ClusterId kApplicationBasicClusterId = 0x050D;
+constexpr chip::ClusterId kBarrierControlClusterId = 0x0103;
+constexpr chip::ClusterId kBasicClusterId = 0x0028;
+constexpr chip::ClusterId kBindingClusterId = 0xF000;
+constexpr chip::ClusterId kColorControlClusterId = 0x0300;
+constexpr chip::ClusterId kDoorLockClusterId = 0x0101;
+constexpr chip::ClusterId kGeneralCommissioningClusterId = 0x0030;
+constexpr chip::ClusterId kGroupsClusterId = 0x0004;
+constexpr chip::ClusterId kIdentifyClusterId = 0x0003;
+constexpr chip::ClusterId kLevelControlClusterId = 0x0008;
+constexpr chip::ClusterId kLowPowerClusterId = 0x0508;
+constexpr chip::ClusterId kOnOffClusterId = 0x0006;
+constexpr chip::ClusterId kScenesClusterId = 0x0005;
 constexpr chip::ClusterId kTemperatureMeasurementClusterId = 0x0402;
 
 /*----------------------------------------------------------------------------*\
@@ -457,18 +450,22 @@ constexpr chip::ClusterId kTemperatureMeasurementClusterId = 0x0402;
 | * ClusterRevision                                                   | 0xFFFD |
 \*----------------------------------------------------------------------------*/
 
+
 /*
  * Discover Attributes
  */
-class DiscoverApplicationBasicAttributes : public ModelCommand
+class DiscoverApplicationBasicAttributes: public ModelCommand
 {
 public:
-    DiscoverApplicationBasicAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverApplicationBasicAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverApplicationBasicAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -481,19 +478,17 @@ class DiscoverApplicationBasicAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute VendorName
  */
-class ReadApplicationBasicVendorName : public ModelCommand
+class ReadApplicationBasicVendorName: public ModelCommand
 {
 public:
-    ReadApplicationBasicVendorName() : ModelCommand("read")
+    ReadApplicationBasicVendorName(): ModelCommand("read")
     {
         AddArgument("attr-name", "vendor-name");
         ModelCommand::AddArguments();
@@ -501,8 +496,8 @@ class ReadApplicationBasicVendorName : public ModelCommand
 
     ~ReadApplicationBasicVendorName()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -515,19 +510,17 @@ class ReadApplicationBasicVendorName : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute VendorId
  */
-class ReadApplicationBasicVendorId : public ModelCommand
+class ReadApplicationBasicVendorId: public ModelCommand
 {
 public:
-    ReadApplicationBasicVendorId() : ModelCommand("read")
+    ReadApplicationBasicVendorId(): ModelCommand("read")
     {
         AddArgument("attr-name", "vendor-id");
         ModelCommand::AddArguments();
@@ -535,8 +528,8 @@ class ReadApplicationBasicVendorId : public ModelCommand
 
     ~ReadApplicationBasicVendorId()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -549,19 +542,17 @@ class ReadApplicationBasicVendorId : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ApplicationName
  */
-class ReadApplicationBasicApplicationName : public ModelCommand
+class ReadApplicationBasicApplicationName: public ModelCommand
 {
 public:
-    ReadApplicationBasicApplicationName() : ModelCommand("read")
+    ReadApplicationBasicApplicationName(): ModelCommand("read")
     {
         AddArgument("attr-name", "application-name");
         ModelCommand::AddArguments();
@@ -569,8 +560,8 @@ class ReadApplicationBasicApplicationName : public ModelCommand
 
     ~ReadApplicationBasicApplicationName()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -583,19 +574,17 @@ class ReadApplicationBasicApplicationName : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ProductId
  */
-class ReadApplicationBasicProductId : public ModelCommand
+class ReadApplicationBasicProductId: public ModelCommand
 {
 public:
-    ReadApplicationBasicProductId() : ModelCommand("read")
+    ReadApplicationBasicProductId(): ModelCommand("read")
     {
         AddArgument("attr-name", "product-id");
         ModelCommand::AddArguments();
@@ -603,8 +592,8 @@ class ReadApplicationBasicProductId : public ModelCommand
 
     ~ReadApplicationBasicProductId()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -617,19 +606,17 @@ class ReadApplicationBasicProductId : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ApplicationId
  */
-class ReadApplicationBasicApplicationId : public ModelCommand
+class ReadApplicationBasicApplicationId: public ModelCommand
 {
 public:
-    ReadApplicationBasicApplicationId() : ModelCommand("read")
+    ReadApplicationBasicApplicationId(): ModelCommand("read")
     {
         AddArgument("attr-name", "application-id");
         ModelCommand::AddArguments();
@@ -637,8 +624,8 @@ class ReadApplicationBasicApplicationId : public ModelCommand
 
     ~ReadApplicationBasicApplicationId()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -651,19 +638,17 @@ class ReadApplicationBasicApplicationId : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CatalogVendorId
  */
-class ReadApplicationBasicCatalogVendorId : public ModelCommand
+class ReadApplicationBasicCatalogVendorId: public ModelCommand
 {
 public:
-    ReadApplicationBasicCatalogVendorId() : ModelCommand("read")
+    ReadApplicationBasicCatalogVendorId(): ModelCommand("read")
     {
         AddArgument("attr-name", "catalog-vendor-id");
         ModelCommand::AddArguments();
@@ -671,8 +656,8 @@ class ReadApplicationBasicCatalogVendorId : public ModelCommand
 
     ~ReadApplicationBasicCatalogVendorId()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -685,19 +670,17 @@ class ReadApplicationBasicCatalogVendorId : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ApplicationSatus
  */
-class ReadApplicationBasicApplicationSatus : public ModelCommand
+class ReadApplicationBasicApplicationSatus: public ModelCommand
 {
 public:
-    ReadApplicationBasicApplicationSatus() : ModelCommand("read")
+    ReadApplicationBasicApplicationSatus(): ModelCommand("read")
     {
         AddArgument("attr-name", "application-satus");
         ModelCommand::AddArguments();
@@ -705,8 +688,8 @@ class ReadApplicationBasicApplicationSatus : public ModelCommand
 
     ~ReadApplicationBasicApplicationSatus()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -719,19 +702,17 @@ class ReadApplicationBasicApplicationSatus : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadApplicationBasicClusterRevision : public ModelCommand
+class ReadApplicationBasicClusterRevision: public ModelCommand
 {
 public:
-    ReadApplicationBasicClusterRevision() : ModelCommand("read")
+    ReadApplicationBasicClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -739,8 +720,8 @@ class ReadApplicationBasicClusterRevision : public ModelCommand
 
     ~ReadApplicationBasicClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -753,10 +734,8 @@ class ReadApplicationBasicClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -777,18 +756,18 @@ class ReadApplicationBasicClusterRevision : public ModelCommand
 /*
  * Command BarrierControlGoToPercent
  */
-class BarrierControlBarrierControlGoToPercent : public ModelCommand
+class BarrierControlBarrierControlGoToPercent: public ModelCommand
 {
 public:
-    BarrierControlBarrierControlGoToPercent() : ModelCommand("barrier-control-go-to-percent")
+    BarrierControlBarrierControlGoToPercent(): ModelCommand("barrier-control-go-to-percent")
     {
         AddArgument("percentOpen", 0, UINT8_MAX, &mPercentOpen);
         ModelCommand::AddArguments();
     }
     ~BarrierControlBarrierControlGoToPercent()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -801,24 +780,25 @@ class BarrierControlBarrierControlGoToPercent : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mPercentOpen;
 };
 
 /*
  * Command BarrierControlStop
  */
-class BarrierControlBarrierControlStop : public ModelCommand
+class BarrierControlBarrierControlStop: public ModelCommand
 {
 public:
-    BarrierControlBarrierControlStop() : ModelCommand("barrier-control-stop") { ModelCommand::AddArguments(); }
+    BarrierControlBarrierControlStop(): ModelCommand("barrier-control-stop")
+    {
+        ModelCommand::AddArguments();
+    }
     ~BarrierControlBarrierControlStop()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -831,24 +811,26 @@ class BarrierControlBarrierControlStop : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverBarrierControlAttributes : public ModelCommand
+class DiscoverBarrierControlAttributes: public ModelCommand
 {
 public:
-    DiscoverBarrierControlAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverBarrierControlAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverBarrierControlAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -861,19 +843,17 @@ class DiscoverBarrierControlAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute BarrierMovingState
  */
-class ReadBarrierControlBarrierMovingState : public ModelCommand
+class ReadBarrierControlBarrierMovingState: public ModelCommand
 {
 public:
-    ReadBarrierControlBarrierMovingState() : ModelCommand("read")
+    ReadBarrierControlBarrierMovingState(): ModelCommand("read")
     {
         AddArgument("attr-name", "barrier-moving-state");
         ModelCommand::AddArguments();
@@ -881,8 +861,8 @@ class ReadBarrierControlBarrierMovingState : public ModelCommand
 
     ~ReadBarrierControlBarrierMovingState()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -895,19 +875,17 @@ class ReadBarrierControlBarrierMovingState : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute BarrierSafetyStatus
  */
-class ReadBarrierControlBarrierSafetyStatus : public ModelCommand
+class ReadBarrierControlBarrierSafetyStatus: public ModelCommand
 {
 public:
-    ReadBarrierControlBarrierSafetyStatus() : ModelCommand("read")
+    ReadBarrierControlBarrierSafetyStatus(): ModelCommand("read")
     {
         AddArgument("attr-name", "barrier-safety-status");
         ModelCommand::AddArguments();
@@ -915,8 +893,8 @@ class ReadBarrierControlBarrierSafetyStatus : public ModelCommand
 
     ~ReadBarrierControlBarrierSafetyStatus()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -929,19 +907,17 @@ class ReadBarrierControlBarrierSafetyStatus : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute BarrierCapabilities
  */
-class ReadBarrierControlBarrierCapabilities : public ModelCommand
+class ReadBarrierControlBarrierCapabilities: public ModelCommand
 {
 public:
-    ReadBarrierControlBarrierCapabilities() : ModelCommand("read")
+    ReadBarrierControlBarrierCapabilities(): ModelCommand("read")
     {
         AddArgument("attr-name", "barrier-capabilities");
         ModelCommand::AddArguments();
@@ -949,8 +925,8 @@ class ReadBarrierControlBarrierCapabilities : public ModelCommand
 
     ~ReadBarrierControlBarrierCapabilities()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -963,19 +939,17 @@ class ReadBarrierControlBarrierCapabilities : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute BarrierPosition
  */
-class ReadBarrierControlBarrierPosition : public ModelCommand
+class ReadBarrierControlBarrierPosition: public ModelCommand
 {
 public:
-    ReadBarrierControlBarrierPosition() : ModelCommand("read")
+    ReadBarrierControlBarrierPosition(): ModelCommand("read")
     {
         AddArgument("attr-name", "barrier-position");
         ModelCommand::AddArguments();
@@ -983,8 +957,8 @@ class ReadBarrierControlBarrierPosition : public ModelCommand
 
     ~ReadBarrierControlBarrierPosition()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -997,19 +971,17 @@ class ReadBarrierControlBarrierPosition : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadBarrierControlClusterRevision : public ModelCommand
+class ReadBarrierControlClusterRevision: public ModelCommand
 {
 public:
-    ReadBarrierControlClusterRevision() : ModelCommand("read")
+    ReadBarrierControlClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -1017,8 +989,8 @@ class ReadBarrierControlClusterRevision : public ModelCommand
 
     ~ReadBarrierControlClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1031,10 +1003,8 @@ class ReadBarrierControlClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -1061,14 +1031,17 @@ class ReadBarrierControlClusterRevision : public ModelCommand
 /*
  * Command MfgSpecificPing
  */
-class BasicMfgSpecificPing : public ModelCommand
+class BasicMfgSpecificPing: public ModelCommand
 {
 public:
-    BasicMfgSpecificPing() : ModelCommand("mfg-specific-ping") { ModelCommand::AddArguments(); }
+    BasicMfgSpecificPing(): ModelCommand("mfg-specific-ping")
+    {
+        ModelCommand::AddArguments();
+    }
     ~BasicMfgSpecificPing()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1081,24 +1054,26 @@ class BasicMfgSpecificPing : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverBasicAttributes : public ModelCommand
+class DiscoverBasicAttributes: public ModelCommand
 {
 public:
-    DiscoverBasicAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverBasicAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverBasicAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1111,19 +1086,17 @@ class DiscoverBasicAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute InteractionModelVersion
  */
-class ReadBasicInteractionModelVersion : public ModelCommand
+class ReadBasicInteractionModelVersion: public ModelCommand
 {
 public:
-    ReadBasicInteractionModelVersion() : ModelCommand("read")
+    ReadBasicInteractionModelVersion(): ModelCommand("read")
     {
         AddArgument("attr-name", "interaction-model-version");
         ModelCommand::AddArguments();
@@ -1131,8 +1104,8 @@ class ReadBasicInteractionModelVersion : public ModelCommand
 
     ~ReadBasicInteractionModelVersion()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1145,19 +1118,17 @@ class ReadBasicInteractionModelVersion : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute VendorName
  */
-class ReadBasicVendorName : public ModelCommand
+class ReadBasicVendorName: public ModelCommand
 {
 public:
-    ReadBasicVendorName() : ModelCommand("read")
+    ReadBasicVendorName(): ModelCommand("read")
     {
         AddArgument("attr-name", "vendor-name");
         ModelCommand::AddArguments();
@@ -1165,8 +1136,8 @@ class ReadBasicVendorName : public ModelCommand
 
     ~ReadBasicVendorName()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1179,19 +1150,17 @@ class ReadBasicVendorName : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute VendorID
  */
-class ReadBasicVendorID : public ModelCommand
+class ReadBasicVendorID: public ModelCommand
 {
 public:
-    ReadBasicVendorID() : ModelCommand("read")
+    ReadBasicVendorID(): ModelCommand("read")
     {
         AddArgument("attr-name", "vendor-id");
         ModelCommand::AddArguments();
@@ -1199,8 +1168,8 @@ class ReadBasicVendorID : public ModelCommand
 
     ~ReadBasicVendorID()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1213,19 +1182,17 @@ class ReadBasicVendorID : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ProductName
  */
-class ReadBasicProductName : public ModelCommand
+class ReadBasicProductName: public ModelCommand
 {
 public:
-    ReadBasicProductName() : ModelCommand("read")
+    ReadBasicProductName(): ModelCommand("read")
     {
         AddArgument("attr-name", "product-name");
         ModelCommand::AddArguments();
@@ -1233,8 +1200,8 @@ class ReadBasicProductName : public ModelCommand
 
     ~ReadBasicProductName()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1247,19 +1214,17 @@ class ReadBasicProductName : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ProductID
  */
-class ReadBasicProductID : public ModelCommand
+class ReadBasicProductID: public ModelCommand
 {
 public:
-    ReadBasicProductID() : ModelCommand("read")
+    ReadBasicProductID(): ModelCommand("read")
     {
         AddArgument("attr-name", "product-id");
         ModelCommand::AddArguments();
@@ -1267,8 +1232,8 @@ class ReadBasicProductID : public ModelCommand
 
     ~ReadBasicProductID()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1281,19 +1246,17 @@ class ReadBasicProductID : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute UserLabel
  */
-class ReadBasicUserLabel : public ModelCommand
+class ReadBasicUserLabel: public ModelCommand
 {
 public:
-    ReadBasicUserLabel() : ModelCommand("read")
+    ReadBasicUserLabel(): ModelCommand("read")
     {
         AddArgument("attr-name", "user-label");
         ModelCommand::AddArguments();
@@ -1301,8 +1264,8 @@ class ReadBasicUserLabel : public ModelCommand
 
     ~ReadBasicUserLabel()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1315,16 +1278,14 @@ class ReadBasicUserLabel : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteBasicUserLabel : public ModelCommand
+class WriteBasicUserLabel: public ModelCommand
 {
 public:
-    WriteBasicUserLabel() : ModelCommand("write")
+    WriteBasicUserLabel(): ModelCommand("write")
     {
         AddArgument("attr-name", "user-label");
         AddArgument("attr-value", &mValue);
@@ -1333,8 +1294,8 @@ class WriteBasicUserLabel : public ModelCommand
 
     ~WriteBasicUserLabel()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1343,25 +1304,22 @@ class WriteBasicUserLabel : public ModelCommand
 
         chip::Controller::BasicCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.WriteAttributeUserLabel(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                               chip::ByteSpan(chip::Uint8::from_char(mValue), strlen(mValue)));
+        return cluster.WriteAttributeUserLabel(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),  chip::ByteSpan(chip::Uint8::from_char(mValue), strlen(mValue)));
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     char * mValue;
 };
 
 /*
  * Attribute Location
  */
-class ReadBasicLocation : public ModelCommand
+class ReadBasicLocation: public ModelCommand
 {
 public:
-    ReadBasicLocation() : ModelCommand("read")
+    ReadBasicLocation(): ModelCommand("read")
     {
         AddArgument("attr-name", "location");
         ModelCommand::AddArguments();
@@ -1369,8 +1327,8 @@ class ReadBasicLocation : public ModelCommand
 
     ~ReadBasicLocation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1383,16 +1341,14 @@ class ReadBasicLocation : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteBasicLocation : public ModelCommand
+class WriteBasicLocation: public ModelCommand
 {
 public:
-    WriteBasicLocation() : ModelCommand("write")
+    WriteBasicLocation(): ModelCommand("write")
     {
         AddArgument("attr-name", "location");
         AddArgument("attr-value", &mValue);
@@ -1401,8 +1357,8 @@ class WriteBasicLocation : public ModelCommand
 
     ~WriteBasicLocation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1411,25 +1367,22 @@ class WriteBasicLocation : public ModelCommand
 
         chip::Controller::BasicCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.WriteAttributeLocation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                              chip::ByteSpan(chip::Uint8::from_char(mValue), strlen(mValue)));
+        return cluster.WriteAttributeLocation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),  chip::ByteSpan(chip::Uint8::from_char(mValue), strlen(mValue)));
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     char * mValue;
 };
 
 /*
  * Attribute HardwareVersion
  */
-class ReadBasicHardwareVersion : public ModelCommand
+class ReadBasicHardwareVersion: public ModelCommand
 {
 public:
-    ReadBasicHardwareVersion() : ModelCommand("read")
+    ReadBasicHardwareVersion(): ModelCommand("read")
     {
         AddArgument("attr-name", "hardware-version");
         ModelCommand::AddArguments();
@@ -1437,8 +1390,8 @@ class ReadBasicHardwareVersion : public ModelCommand
 
     ~ReadBasicHardwareVersion()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1451,19 +1404,17 @@ class ReadBasicHardwareVersion : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute HardwareVersionString
  */
-class ReadBasicHardwareVersionString : public ModelCommand
+class ReadBasicHardwareVersionString: public ModelCommand
 {
 public:
-    ReadBasicHardwareVersionString() : ModelCommand("read")
+    ReadBasicHardwareVersionString(): ModelCommand("read")
     {
         AddArgument("attr-name", "hardware-version-string");
         ModelCommand::AddArguments();
@@ -1471,8 +1422,8 @@ class ReadBasicHardwareVersionString : public ModelCommand
 
     ~ReadBasicHardwareVersionString()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1485,19 +1436,17 @@ class ReadBasicHardwareVersionString : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute SoftwareVersion
  */
-class ReadBasicSoftwareVersion : public ModelCommand
+class ReadBasicSoftwareVersion: public ModelCommand
 {
 public:
-    ReadBasicSoftwareVersion() : ModelCommand("read")
+    ReadBasicSoftwareVersion(): ModelCommand("read")
     {
         AddArgument("attr-name", "software-version");
         ModelCommand::AddArguments();
@@ -1505,8 +1454,8 @@ class ReadBasicSoftwareVersion : public ModelCommand
 
     ~ReadBasicSoftwareVersion()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1519,19 +1468,17 @@ class ReadBasicSoftwareVersion : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int32uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int32uAttributeCallback>(OnInt32uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int32uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int32uAttributeCallback>(OnInt32uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute SoftwareVersionString
  */
-class ReadBasicSoftwareVersionString : public ModelCommand
+class ReadBasicSoftwareVersionString: public ModelCommand
 {
 public:
-    ReadBasicSoftwareVersionString() : ModelCommand("read")
+    ReadBasicSoftwareVersionString(): ModelCommand("read")
     {
         AddArgument("attr-name", "software-version-string");
         ModelCommand::AddArguments();
@@ -1539,8 +1486,8 @@ class ReadBasicSoftwareVersionString : public ModelCommand
 
     ~ReadBasicSoftwareVersionString()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1553,19 +1500,17 @@ class ReadBasicSoftwareVersionString : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadBasicClusterRevision : public ModelCommand
+class ReadBasicClusterRevision: public ModelCommand
 {
 public:
-    ReadBasicClusterRevision() : ModelCommand("read")
+    ReadBasicClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -1573,8 +1518,8 @@ class ReadBasicClusterRevision : public ModelCommand
 
     ~ReadBasicClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1587,10 +1532,8 @@ class ReadBasicClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -1607,10 +1550,10 @@ class ReadBasicClusterRevision : public ModelCommand
 /*
  * Command Bind
  */
-class BindingBind : public ModelCommand
+class BindingBind: public ModelCommand
 {
 public:
-    BindingBind() : ModelCommand("bind")
+    BindingBind(): ModelCommand("bind")
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
@@ -1620,8 +1563,8 @@ class BindingBind : public ModelCommand
     }
     ~BindingBind()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1634,10 +1577,8 @@ class BindingBind : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     chip::NodeId mNodeId;
     chip::GroupId mGroupId;
     chip::EndpointId mEndpointId;
@@ -1647,10 +1588,10 @@ class BindingBind : public ModelCommand
 /*
  * Command Unbind
  */
-class BindingUnbind : public ModelCommand
+class BindingUnbind: public ModelCommand
 {
 public:
-    BindingUnbind() : ModelCommand("unbind")
+    BindingUnbind(): ModelCommand("unbind")
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
@@ -1660,8 +1601,8 @@ class BindingUnbind : public ModelCommand
     }
     ~BindingUnbind()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1674,28 +1615,30 @@ class BindingUnbind : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     chip::NodeId mNodeId;
     chip::GroupId mGroupId;
     chip::EndpointId mEndpointId;
     chip::ClusterId mClusterId;
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverBindingAttributes : public ModelCommand
+class DiscoverBindingAttributes: public ModelCommand
 {
 public:
-    DiscoverBindingAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverBindingAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverBindingAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1708,19 +1651,17 @@ class DiscoverBindingAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadBindingClusterRevision : public ModelCommand
+class ReadBindingClusterRevision: public ModelCommand
 {
 public:
-    ReadBindingClusterRevision() : ModelCommand("read")
+    ReadBindingClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -1728,8 +1669,8 @@ class ReadBindingClusterRevision : public ModelCommand
 
     ~ReadBindingClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1742,10 +1683,8 @@ class ReadBindingClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -1824,10 +1763,10 @@ class ReadBindingClusterRevision : public ModelCommand
 /*
  * Command MoveColor
  */
-class ColorControlMoveColor : public ModelCommand
+class ColorControlMoveColor: public ModelCommand
 {
 public:
-    ColorControlMoveColor() : ModelCommand("move-color")
+    ColorControlMoveColor(): ModelCommand("move-color")
     {
         AddArgument("rateX", INT16_MIN, INT16_MAX, &mRateX);
         AddArgument("rateY", INT16_MIN, INT16_MAX, &mRateY);
@@ -1837,8 +1776,8 @@ class ColorControlMoveColor : public ModelCommand
     }
     ~ColorControlMoveColor()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1847,15 +1786,12 @@ class ColorControlMoveColor : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveColor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mRateX, mRateY, mOptionsMask,
-                                 mOptionsOverride);
+        return cluster.MoveColor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mRateX, mRateY, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     int16_t mRateX;
     int16_t mRateY;
     uint8_t mOptionsMask;
@@ -1865,10 +1801,10 @@ class ColorControlMoveColor : public ModelCommand
 /*
  * Command MoveColorTemperature
  */
-class ColorControlMoveColorTemperature : public ModelCommand
+class ColorControlMoveColorTemperature: public ModelCommand
 {
 public:
-    ColorControlMoveColorTemperature() : ModelCommand("move-color-temperature")
+    ColorControlMoveColorTemperature(): ModelCommand("move-color-temperature")
     {
         AddArgument("moveMode", 0, UINT8_MAX, &mMoveMode);
         AddArgument("rate", 0, UINT16_MAX, &mRate);
@@ -1880,8 +1816,8 @@ class ColorControlMoveColorTemperature : public ModelCommand
     }
     ~ColorControlMoveColorTemperature()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1890,15 +1826,12 @@ class ColorControlMoveColorTemperature : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate,
-                                            mColorTemperatureMinimum, mColorTemperatureMaximum, mOptionsMask, mOptionsOverride);
+        return cluster.MoveColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate, mColorTemperatureMinimum, mColorTemperatureMaximum, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mMoveMode;
     uint16_t mRate;
     uint16_t mColorTemperatureMinimum;
@@ -1910,10 +1843,10 @@ class ColorControlMoveColorTemperature : public ModelCommand
 /*
  * Command MoveHue
  */
-class ColorControlMoveHue : public ModelCommand
+class ColorControlMoveHue: public ModelCommand
 {
 public:
-    ColorControlMoveHue() : ModelCommand("move-hue")
+    ColorControlMoveHue(): ModelCommand("move-hue")
     {
         AddArgument("moveMode", 0, UINT8_MAX, &mMoveMode);
         AddArgument("rate", 0, UINT8_MAX, &mRate);
@@ -1923,8 +1856,8 @@ class ColorControlMoveHue : public ModelCommand
     }
     ~ColorControlMoveHue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1933,15 +1866,12 @@ class ColorControlMoveHue : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate, mOptionsMask,
-                               mOptionsOverride);
+        return cluster.MoveHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mMoveMode;
     uint8_t mRate;
     uint8_t mOptionsMask;
@@ -1951,10 +1881,10 @@ class ColorControlMoveHue : public ModelCommand
 /*
  * Command MoveSaturation
  */
-class ColorControlMoveSaturation : public ModelCommand
+class ColorControlMoveSaturation: public ModelCommand
 {
 public:
-    ColorControlMoveSaturation() : ModelCommand("move-saturation")
+    ColorControlMoveSaturation(): ModelCommand("move-saturation")
     {
         AddArgument("moveMode", 0, UINT8_MAX, &mMoveMode);
         AddArgument("rate", 0, UINT8_MAX, &mRate);
@@ -1964,8 +1894,8 @@ class ColorControlMoveSaturation : public ModelCommand
     }
     ~ColorControlMoveSaturation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -1974,15 +1904,12 @@ class ColorControlMoveSaturation : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate, mOptionsMask,
-                                      mOptionsOverride);
+        return cluster.MoveSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mMoveMode;
     uint8_t mRate;
     uint8_t mOptionsMask;
@@ -1992,10 +1919,10 @@ class ColorControlMoveSaturation : public ModelCommand
 /*
  * Command MoveToColor
  */
-class ColorControlMoveToColor : public ModelCommand
+class ColorControlMoveToColor: public ModelCommand
 {
 public:
-    ColorControlMoveToColor() : ModelCommand("move-to-color")
+    ColorControlMoveToColor(): ModelCommand("move-to-color")
     {
         AddArgument("colorX", 0, UINT16_MAX, &mColorX);
         AddArgument("colorY", 0, UINT16_MAX, &mColorY);
@@ -2006,8 +1933,8 @@ class ColorControlMoveToColor : public ModelCommand
     }
     ~ColorControlMoveToColor()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2016,15 +1943,12 @@ class ColorControlMoveToColor : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveToColor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mColorX, mColorY, mTransitionTime,
-                                   mOptionsMask, mOptionsOverride);
+        return cluster.MoveToColor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mColorX, mColorY, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mColorX;
     uint16_t mColorY;
     uint16_t mTransitionTime;
@@ -2035,10 +1959,10 @@ class ColorControlMoveToColor : public ModelCommand
 /*
  * Command MoveToColorTemperature
  */
-class ColorControlMoveToColorTemperature : public ModelCommand
+class ColorControlMoveToColorTemperature: public ModelCommand
 {
 public:
-    ColorControlMoveToColorTemperature() : ModelCommand("move-to-color-temperature")
+    ColorControlMoveToColorTemperature(): ModelCommand("move-to-color-temperature")
     {
         AddArgument("colorTemperature", 0, UINT16_MAX, &mColorTemperature);
         AddArgument("transitionTime", 0, UINT16_MAX, &mTransitionTime);
@@ -2048,8 +1972,8 @@ class ColorControlMoveToColorTemperature : public ModelCommand
     }
     ~ColorControlMoveToColorTemperature()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2058,15 +1982,12 @@ class ColorControlMoveToColorTemperature : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveToColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mColorTemperature,
-                                              mTransitionTime, mOptionsMask, mOptionsOverride);
+        return cluster.MoveToColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mColorTemperature, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mColorTemperature;
     uint16_t mTransitionTime;
     uint8_t mOptionsMask;
@@ -2076,10 +1997,10 @@ class ColorControlMoveToColorTemperature : public ModelCommand
 /*
  * Command MoveToHue
  */
-class ColorControlMoveToHue : public ModelCommand
+class ColorControlMoveToHue: public ModelCommand
 {
 public:
-    ColorControlMoveToHue() : ModelCommand("move-to-hue")
+    ColorControlMoveToHue(): ModelCommand("move-to-hue")
     {
         AddArgument("hue", 0, UINT8_MAX, &mHue);
         AddArgument("direction", 0, UINT8_MAX, &mDirection);
@@ -2090,8 +2011,8 @@ class ColorControlMoveToHue : public ModelCommand
     }
     ~ColorControlMoveToHue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2100,15 +2021,12 @@ class ColorControlMoveToHue : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveToHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mHue, mDirection, mTransitionTime,
-                                 mOptionsMask, mOptionsOverride);
+        return cluster.MoveToHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mHue, mDirection, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mHue;
     uint8_t mDirection;
     uint16_t mTransitionTime;
@@ -2119,10 +2037,10 @@ class ColorControlMoveToHue : public ModelCommand
 /*
  * Command MoveToHueAndSaturation
  */
-class ColorControlMoveToHueAndSaturation : public ModelCommand
+class ColorControlMoveToHueAndSaturation: public ModelCommand
 {
 public:
-    ColorControlMoveToHueAndSaturation() : ModelCommand("move-to-hue-and-saturation")
+    ColorControlMoveToHueAndSaturation(): ModelCommand("move-to-hue-and-saturation")
     {
         AddArgument("hue", 0, UINT8_MAX, &mHue);
         AddArgument("saturation", 0, UINT8_MAX, &mSaturation);
@@ -2133,8 +2051,8 @@ class ColorControlMoveToHueAndSaturation : public ModelCommand
     }
     ~ColorControlMoveToHueAndSaturation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2143,15 +2061,12 @@ class ColorControlMoveToHueAndSaturation : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveToHueAndSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mHue, mSaturation,
-                                              mTransitionTime, mOptionsMask, mOptionsOverride);
+        return cluster.MoveToHueAndSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mHue, mSaturation, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mHue;
     uint8_t mSaturation;
     uint16_t mTransitionTime;
@@ -2162,10 +2077,10 @@ class ColorControlMoveToHueAndSaturation : public ModelCommand
 /*
  * Command MoveToSaturation
  */
-class ColorControlMoveToSaturation : public ModelCommand
+class ColorControlMoveToSaturation: public ModelCommand
 {
 public:
-    ColorControlMoveToSaturation() : ModelCommand("move-to-saturation")
+    ColorControlMoveToSaturation(): ModelCommand("move-to-saturation")
     {
         AddArgument("saturation", 0, UINT8_MAX, &mSaturation);
         AddArgument("transitionTime", 0, UINT16_MAX, &mTransitionTime);
@@ -2175,8 +2090,8 @@ class ColorControlMoveToSaturation : public ModelCommand
     }
     ~ColorControlMoveToSaturation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2185,15 +2100,12 @@ class ColorControlMoveToSaturation : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveToSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mSaturation, mTransitionTime,
-                                        mOptionsMask, mOptionsOverride);
+        return cluster.MoveToSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mSaturation, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mSaturation;
     uint16_t mTransitionTime;
     uint8_t mOptionsMask;
@@ -2203,10 +2115,10 @@ class ColorControlMoveToSaturation : public ModelCommand
 /*
  * Command StepColor
  */
-class ColorControlStepColor : public ModelCommand
+class ColorControlStepColor: public ModelCommand
 {
 public:
-    ColorControlStepColor() : ModelCommand("step-color")
+    ColorControlStepColor(): ModelCommand("step-color")
     {
         AddArgument("stepX", INT16_MIN, INT16_MAX, &mStepX);
         AddArgument("stepY", INT16_MIN, INT16_MAX, &mStepY);
@@ -2217,8 +2129,8 @@ class ColorControlStepColor : public ModelCommand
     }
     ~ColorControlStepColor()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2227,15 +2139,12 @@ class ColorControlStepColor : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.StepColor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepX, mStepY, mTransitionTime,
-                                 mOptionsMask, mOptionsOverride);
+        return cluster.StepColor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepX, mStepY, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     int16_t mStepX;
     int16_t mStepY;
     uint16_t mTransitionTime;
@@ -2246,10 +2155,10 @@ class ColorControlStepColor : public ModelCommand
 /*
  * Command StepColorTemperature
  */
-class ColorControlStepColorTemperature : public ModelCommand
+class ColorControlStepColorTemperature: public ModelCommand
 {
 public:
-    ColorControlStepColorTemperature() : ModelCommand("step-color-temperature")
+    ColorControlStepColorTemperature(): ModelCommand("step-color-temperature")
     {
         AddArgument("stepMode", 0, UINT8_MAX, &mStepMode);
         AddArgument("stepSize", 0, UINT16_MAX, &mStepSize);
@@ -2262,8 +2171,8 @@ class ColorControlStepColorTemperature : public ModelCommand
     }
     ~ColorControlStepColorTemperature()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2272,16 +2181,12 @@ class ColorControlStepColorTemperature : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.StepColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize,
-                                            mTransitionTime, mColorTemperatureMinimum, mColorTemperatureMaximum, mOptionsMask,
-                                            mOptionsOverride);
+        return cluster.StepColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize, mTransitionTime, mColorTemperatureMinimum, mColorTemperatureMaximum, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mStepMode;
     uint16_t mStepSize;
     uint16_t mTransitionTime;
@@ -2294,10 +2199,10 @@ class ColorControlStepColorTemperature : public ModelCommand
 /*
  * Command StepHue
  */
-class ColorControlStepHue : public ModelCommand
+class ColorControlStepHue: public ModelCommand
 {
 public:
-    ColorControlStepHue() : ModelCommand("step-hue")
+    ColorControlStepHue(): ModelCommand("step-hue")
     {
         AddArgument("stepMode", 0, UINT8_MAX, &mStepMode);
         AddArgument("stepSize", 0, UINT8_MAX, &mStepSize);
@@ -2308,8 +2213,8 @@ class ColorControlStepHue : public ModelCommand
     }
     ~ColorControlStepHue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2318,15 +2223,12 @@ class ColorControlStepHue : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.StepHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize, mTransitionTime,
-                               mOptionsMask, mOptionsOverride);
+        return cluster.StepHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mStepMode;
     uint8_t mStepSize;
     uint8_t mTransitionTime;
@@ -2337,10 +2239,10 @@ class ColorControlStepHue : public ModelCommand
 /*
  * Command StepSaturation
  */
-class ColorControlStepSaturation : public ModelCommand
+class ColorControlStepSaturation: public ModelCommand
 {
 public:
-    ColorControlStepSaturation() : ModelCommand("step-saturation")
+    ColorControlStepSaturation(): ModelCommand("step-saturation")
     {
         AddArgument("stepMode", 0, UINT8_MAX, &mStepMode);
         AddArgument("stepSize", 0, UINT8_MAX, &mStepSize);
@@ -2351,8 +2253,8 @@ class ColorControlStepSaturation : public ModelCommand
     }
     ~ColorControlStepSaturation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2361,15 +2263,12 @@ class ColorControlStepSaturation : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.StepSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize,
-                                      mTransitionTime, mOptionsMask, mOptionsOverride);
+        return cluster.StepSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize, mTransitionTime, mOptionsMask, mOptionsOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mStepMode;
     uint8_t mStepSize;
     uint8_t mTransitionTime;
@@ -2380,10 +2279,10 @@ class ColorControlStepSaturation : public ModelCommand
 /*
  * Command StopMoveStep
  */
-class ColorControlStopMoveStep : public ModelCommand
+class ColorControlStopMoveStep: public ModelCommand
 {
 public:
-    ColorControlStopMoveStep() : ModelCommand("stop-move-step")
+    ColorControlStopMoveStep(): ModelCommand("stop-move-step")
     {
         AddArgument("optionsMask", 0, UINT8_MAX, &mOptionsMask);
         AddArgument("optionsOverride", 0, UINT8_MAX, &mOptionsOverride);
@@ -2391,8 +2290,8 @@ class ColorControlStopMoveStep : public ModelCommand
     }
     ~ColorControlStopMoveStep()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2405,26 +2304,28 @@ class ColorControlStopMoveStep : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mOptionsMask;
     uint8_t mOptionsOverride;
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverColorControlAttributes : public ModelCommand
+class DiscoverColorControlAttributes: public ModelCommand
 {
 public:
-    DiscoverColorControlAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverColorControlAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverColorControlAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2437,19 +2338,17 @@ class DiscoverColorControlAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CurrentHue
  */
-class ReadColorControlCurrentHue : public ModelCommand
+class ReadColorControlCurrentHue: public ModelCommand
 {
 public:
-    ReadColorControlCurrentHue() : ModelCommand("read")
+    ReadColorControlCurrentHue(): ModelCommand("read")
     {
         AddArgument("attr-name", "current-hue");
         ModelCommand::AddArguments();
@@ -2457,8 +2356,8 @@ class ReadColorControlCurrentHue : public ModelCommand
 
     ~ReadColorControlCurrentHue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2471,16 +2370,14 @@ class ReadColorControlCurrentHue : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportColorControlCurrentHue : public ModelCommand
+class ReportColorControlCurrentHue: public ModelCommand
 {
 public:
-    ReportColorControlCurrentHue() : ModelCommand("report")
+    ReportColorControlCurrentHue(): ModelCommand("report")
     {
         AddArgument("attr-name", "current-hue");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -2491,9 +2388,9 @@ class ReportColorControlCurrentHue : public ModelCommand
 
     ~ReportColorControlCurrentHue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2509,17 +2406,13 @@ class ReportColorControlCurrentHue : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeCurrentHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                    mMaxInterval, mChange);
+        return cluster.ConfigureAttributeCurrentHue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval, mChange);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     uint8_t mChange;
@@ -2528,10 +2421,10 @@ class ReportColorControlCurrentHue : public ModelCommand
 /*
  * Attribute CurrentSaturation
  */
-class ReadColorControlCurrentSaturation : public ModelCommand
+class ReadColorControlCurrentSaturation: public ModelCommand
 {
 public:
-    ReadColorControlCurrentSaturation() : ModelCommand("read")
+    ReadColorControlCurrentSaturation(): ModelCommand("read")
     {
         AddArgument("attr-name", "current-saturation");
         ModelCommand::AddArguments();
@@ -2539,8 +2432,8 @@ class ReadColorControlCurrentSaturation : public ModelCommand
 
     ~ReadColorControlCurrentSaturation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2553,16 +2446,14 @@ class ReadColorControlCurrentSaturation : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportColorControlCurrentSaturation : public ModelCommand
+class ReportColorControlCurrentSaturation: public ModelCommand
 {
 public:
-    ReportColorControlCurrentSaturation() : ModelCommand("report")
+    ReportColorControlCurrentSaturation(): ModelCommand("report")
     {
         AddArgument("attr-name", "current-saturation");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -2573,9 +2464,9 @@ class ReportColorControlCurrentSaturation : public ModelCommand
 
     ~ReportColorControlCurrentSaturation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2591,17 +2482,13 @@ class ReportColorControlCurrentSaturation : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeCurrentSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                           mMaxInterval, mChange);
+        return cluster.ConfigureAttributeCurrentSaturation(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval, mChange);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     uint8_t mChange;
@@ -2610,10 +2497,10 @@ class ReportColorControlCurrentSaturation : public ModelCommand
 /*
  * Attribute RemainingTime
  */
-class ReadColorControlRemainingTime : public ModelCommand
+class ReadColorControlRemainingTime: public ModelCommand
 {
 public:
-    ReadColorControlRemainingTime() : ModelCommand("read")
+    ReadColorControlRemainingTime(): ModelCommand("read")
     {
         AddArgument("attr-name", "remaining-time");
         ModelCommand::AddArguments();
@@ -2621,8 +2508,8 @@ class ReadColorControlRemainingTime : public ModelCommand
 
     ~ReadColorControlRemainingTime()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2635,19 +2522,17 @@ class ReadColorControlRemainingTime : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CurrentX
  */
-class ReadColorControlCurrentX : public ModelCommand
+class ReadColorControlCurrentX: public ModelCommand
 {
 public:
-    ReadColorControlCurrentX() : ModelCommand("read")
+    ReadColorControlCurrentX(): ModelCommand("read")
     {
         AddArgument("attr-name", "current-x");
         ModelCommand::AddArguments();
@@ -2655,8 +2540,8 @@ class ReadColorControlCurrentX : public ModelCommand
 
     ~ReadColorControlCurrentX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2669,16 +2554,14 @@ class ReadColorControlCurrentX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportColorControlCurrentX : public ModelCommand
+class ReportColorControlCurrentX: public ModelCommand
 {
 public:
-    ReportColorControlCurrentX() : ModelCommand("report")
+    ReportColorControlCurrentX(): ModelCommand("report")
     {
         AddArgument("attr-name", "current-x");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -2689,9 +2572,9 @@ class ReportColorControlCurrentX : public ModelCommand
 
     ~ReportColorControlCurrentX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2707,17 +2590,13 @@ class ReportColorControlCurrentX : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeCurrentX(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                  mMaxInterval, mChange);
+        return cluster.ConfigureAttributeCurrentX(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval, mChange);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int16uAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     uint16_t mChange;
@@ -2726,10 +2605,10 @@ class ReportColorControlCurrentX : public ModelCommand
 /*
  * Attribute CurrentY
  */
-class ReadColorControlCurrentY : public ModelCommand
+class ReadColorControlCurrentY: public ModelCommand
 {
 public:
-    ReadColorControlCurrentY() : ModelCommand("read")
+    ReadColorControlCurrentY(): ModelCommand("read")
     {
         AddArgument("attr-name", "current-y");
         ModelCommand::AddArguments();
@@ -2737,8 +2616,8 @@ class ReadColorControlCurrentY : public ModelCommand
 
     ~ReadColorControlCurrentY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2751,16 +2630,14 @@ class ReadColorControlCurrentY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportColorControlCurrentY : public ModelCommand
+class ReportColorControlCurrentY: public ModelCommand
 {
 public:
-    ReportColorControlCurrentY() : ModelCommand("report")
+    ReportColorControlCurrentY(): ModelCommand("report")
     {
         AddArgument("attr-name", "current-y");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -2771,9 +2648,9 @@ class ReportColorControlCurrentY : public ModelCommand
 
     ~ReportColorControlCurrentY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2789,17 +2666,13 @@ class ReportColorControlCurrentY : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeCurrentY(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                  mMaxInterval, mChange);
+        return cluster.ConfigureAttributeCurrentY(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval, mChange);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int16uAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     uint16_t mChange;
@@ -2808,10 +2681,10 @@ class ReportColorControlCurrentY : public ModelCommand
 /*
  * Attribute DriftCompensation
  */
-class ReadColorControlDriftCompensation : public ModelCommand
+class ReadColorControlDriftCompensation: public ModelCommand
 {
 public:
-    ReadColorControlDriftCompensation() : ModelCommand("read")
+    ReadColorControlDriftCompensation(): ModelCommand("read")
     {
         AddArgument("attr-name", "drift-compensation");
         ModelCommand::AddArguments();
@@ -2819,8 +2692,8 @@ class ReadColorControlDriftCompensation : public ModelCommand
 
     ~ReadColorControlDriftCompensation()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2833,19 +2706,17 @@ class ReadColorControlDriftCompensation : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CompensationText
  */
-class ReadColorControlCompensationText : public ModelCommand
+class ReadColorControlCompensationText: public ModelCommand
 {
 public:
-    ReadColorControlCompensationText() : ModelCommand("read")
+    ReadColorControlCompensationText(): ModelCommand("read")
     {
         AddArgument("attr-name", "compensation-text");
         ModelCommand::AddArguments();
@@ -2853,8 +2724,8 @@ class ReadColorControlCompensationText : public ModelCommand
 
     ~ReadColorControlCompensationText()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2867,19 +2738,17 @@ class ReadColorControlCompensationText : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorTemperature
  */
-class ReadColorControlColorTemperature : public ModelCommand
+class ReadColorControlColorTemperature: public ModelCommand
 {
 public:
-    ReadColorControlColorTemperature() : ModelCommand("read")
+    ReadColorControlColorTemperature(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-temperature");
         ModelCommand::AddArguments();
@@ -2887,8 +2756,8 @@ class ReadColorControlColorTemperature : public ModelCommand
 
     ~ReadColorControlColorTemperature()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2901,16 +2770,14 @@ class ReadColorControlColorTemperature : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportColorControlColorTemperature : public ModelCommand
+class ReportColorControlColorTemperature: public ModelCommand
 {
 public:
-    ReportColorControlColorTemperature() : ModelCommand("report")
+    ReportColorControlColorTemperature(): ModelCommand("report")
     {
         AddArgument("attr-name", "color-temperature");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -2921,9 +2788,9 @@ class ReportColorControlColorTemperature : public ModelCommand
 
     ~ReportColorControlColorTemperature()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2939,17 +2806,13 @@ class ReportColorControlColorTemperature : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                          mMaxInterval, mChange);
+        return cluster.ConfigureAttributeColorTemperature(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval, mChange);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int16uAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     uint16_t mChange;
@@ -2958,10 +2821,10 @@ class ReportColorControlColorTemperature : public ModelCommand
 /*
  * Attribute ColorMode
  */
-class ReadColorControlColorMode : public ModelCommand
+class ReadColorControlColorMode: public ModelCommand
 {
 public:
-    ReadColorControlColorMode() : ModelCommand("read")
+    ReadColorControlColorMode(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-mode");
         ModelCommand::AddArguments();
@@ -2969,8 +2832,8 @@ class ReadColorControlColorMode : public ModelCommand
 
     ~ReadColorControlColorMode()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -2983,19 +2846,17 @@ class ReadColorControlColorMode : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorControlOptions
  */
-class ReadColorControlColorControlOptions : public ModelCommand
+class ReadColorControlColorControlOptions: public ModelCommand
 {
 public:
-    ReadColorControlColorControlOptions() : ModelCommand("read")
+    ReadColorControlColorControlOptions(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-control-options");
         ModelCommand::AddArguments();
@@ -3003,8 +2864,8 @@ class ReadColorControlColorControlOptions : public ModelCommand
 
     ~ReadColorControlColorControlOptions()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3017,16 +2878,14 @@ class ReadColorControlColorControlOptions : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorControlOptions : public ModelCommand
+class WriteColorControlColorControlOptions: public ModelCommand
 {
 public:
-    WriteColorControlColorControlOptions() : ModelCommand("write")
+    WriteColorControlColorControlOptions(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-control-options");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
@@ -3035,8 +2894,8 @@ class WriteColorControlColorControlOptions : public ModelCommand
 
     ~WriteColorControlColorControlOptions()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3049,20 +2908,18 @@ class WriteColorControlColorControlOptions : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mValue;
 };
 
 /*
  * Attribute NumberOfPrimaries
  */
-class ReadColorControlNumberOfPrimaries : public ModelCommand
+class ReadColorControlNumberOfPrimaries: public ModelCommand
 {
 public:
-    ReadColorControlNumberOfPrimaries() : ModelCommand("read")
+    ReadColorControlNumberOfPrimaries(): ModelCommand("read")
     {
         AddArgument("attr-name", "number-of-primaries");
         ModelCommand::AddArguments();
@@ -3070,8 +2927,8 @@ class ReadColorControlNumberOfPrimaries : public ModelCommand
 
     ~ReadColorControlNumberOfPrimaries()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3084,19 +2941,17 @@ class ReadColorControlNumberOfPrimaries : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary1X
  */
-class ReadColorControlPrimary1X : public ModelCommand
+class ReadColorControlPrimary1X: public ModelCommand
 {
 public:
-    ReadColorControlPrimary1X() : ModelCommand("read")
+    ReadColorControlPrimary1X(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary1x");
         ModelCommand::AddArguments();
@@ -3104,8 +2959,8 @@ class ReadColorControlPrimary1X : public ModelCommand
 
     ~ReadColorControlPrimary1X()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3118,19 +2973,17 @@ class ReadColorControlPrimary1X : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary1Y
  */
-class ReadColorControlPrimary1Y : public ModelCommand
+class ReadColorControlPrimary1Y: public ModelCommand
 {
 public:
-    ReadColorControlPrimary1Y() : ModelCommand("read")
+    ReadColorControlPrimary1Y(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary1y");
         ModelCommand::AddArguments();
@@ -3138,8 +2991,8 @@ class ReadColorControlPrimary1Y : public ModelCommand
 
     ~ReadColorControlPrimary1Y()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3152,19 +3005,17 @@ class ReadColorControlPrimary1Y : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary1Intensity
  */
-class ReadColorControlPrimary1Intensity : public ModelCommand
+class ReadColorControlPrimary1Intensity: public ModelCommand
 {
 public:
-    ReadColorControlPrimary1Intensity() : ModelCommand("read")
+    ReadColorControlPrimary1Intensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary1intensity");
         ModelCommand::AddArguments();
@@ -3172,8 +3023,8 @@ class ReadColorControlPrimary1Intensity : public ModelCommand
 
     ~ReadColorControlPrimary1Intensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3186,19 +3037,17 @@ class ReadColorControlPrimary1Intensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary2X
  */
-class ReadColorControlPrimary2X : public ModelCommand
+class ReadColorControlPrimary2X: public ModelCommand
 {
 public:
-    ReadColorControlPrimary2X() : ModelCommand("read")
+    ReadColorControlPrimary2X(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary2x");
         ModelCommand::AddArguments();
@@ -3206,8 +3055,8 @@ class ReadColorControlPrimary2X : public ModelCommand
 
     ~ReadColorControlPrimary2X()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3220,19 +3069,17 @@ class ReadColorControlPrimary2X : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary2Y
  */
-class ReadColorControlPrimary2Y : public ModelCommand
+class ReadColorControlPrimary2Y: public ModelCommand
 {
 public:
-    ReadColorControlPrimary2Y() : ModelCommand("read")
+    ReadColorControlPrimary2Y(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary2y");
         ModelCommand::AddArguments();
@@ -3240,8 +3087,8 @@ class ReadColorControlPrimary2Y : public ModelCommand
 
     ~ReadColorControlPrimary2Y()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3254,19 +3101,17 @@ class ReadColorControlPrimary2Y : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary2Intensity
  */
-class ReadColorControlPrimary2Intensity : public ModelCommand
+class ReadColorControlPrimary2Intensity: public ModelCommand
 {
 public:
-    ReadColorControlPrimary2Intensity() : ModelCommand("read")
+    ReadColorControlPrimary2Intensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary2intensity");
         ModelCommand::AddArguments();
@@ -3274,8 +3119,8 @@ class ReadColorControlPrimary2Intensity : public ModelCommand
 
     ~ReadColorControlPrimary2Intensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3288,19 +3133,17 @@ class ReadColorControlPrimary2Intensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary3X
  */
-class ReadColorControlPrimary3X : public ModelCommand
+class ReadColorControlPrimary3X: public ModelCommand
 {
 public:
-    ReadColorControlPrimary3X() : ModelCommand("read")
+    ReadColorControlPrimary3X(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary3x");
         ModelCommand::AddArguments();
@@ -3308,8 +3151,8 @@ class ReadColorControlPrimary3X : public ModelCommand
 
     ~ReadColorControlPrimary3X()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3322,19 +3165,17 @@ class ReadColorControlPrimary3X : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary3Y
  */
-class ReadColorControlPrimary3Y : public ModelCommand
+class ReadColorControlPrimary3Y: public ModelCommand
 {
 public:
-    ReadColorControlPrimary3Y() : ModelCommand("read")
+    ReadColorControlPrimary3Y(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary3y");
         ModelCommand::AddArguments();
@@ -3342,8 +3183,8 @@ class ReadColorControlPrimary3Y : public ModelCommand
 
     ~ReadColorControlPrimary3Y()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3356,19 +3197,17 @@ class ReadColorControlPrimary3Y : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary3Intensity
  */
-class ReadColorControlPrimary3Intensity : public ModelCommand
+class ReadColorControlPrimary3Intensity: public ModelCommand
 {
 public:
-    ReadColorControlPrimary3Intensity() : ModelCommand("read")
+    ReadColorControlPrimary3Intensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary3intensity");
         ModelCommand::AddArguments();
@@ -3376,8 +3215,8 @@ class ReadColorControlPrimary3Intensity : public ModelCommand
 
     ~ReadColorControlPrimary3Intensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3390,19 +3229,17 @@ class ReadColorControlPrimary3Intensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary4X
  */
-class ReadColorControlPrimary4X : public ModelCommand
+class ReadColorControlPrimary4X: public ModelCommand
 {
 public:
-    ReadColorControlPrimary4X() : ModelCommand("read")
+    ReadColorControlPrimary4X(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary4x");
         ModelCommand::AddArguments();
@@ -3410,8 +3247,8 @@ class ReadColorControlPrimary4X : public ModelCommand
 
     ~ReadColorControlPrimary4X()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3424,19 +3261,17 @@ class ReadColorControlPrimary4X : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary4Y
  */
-class ReadColorControlPrimary4Y : public ModelCommand
+class ReadColorControlPrimary4Y: public ModelCommand
 {
 public:
-    ReadColorControlPrimary4Y() : ModelCommand("read")
+    ReadColorControlPrimary4Y(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary4y");
         ModelCommand::AddArguments();
@@ -3444,8 +3279,8 @@ class ReadColorControlPrimary4Y : public ModelCommand
 
     ~ReadColorControlPrimary4Y()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3458,19 +3293,17 @@ class ReadColorControlPrimary4Y : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary4Intensity
  */
-class ReadColorControlPrimary4Intensity : public ModelCommand
+class ReadColorControlPrimary4Intensity: public ModelCommand
 {
 public:
-    ReadColorControlPrimary4Intensity() : ModelCommand("read")
+    ReadColorControlPrimary4Intensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary4intensity");
         ModelCommand::AddArguments();
@@ -3478,8 +3311,8 @@ class ReadColorControlPrimary4Intensity : public ModelCommand
 
     ~ReadColorControlPrimary4Intensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3492,19 +3325,17 @@ class ReadColorControlPrimary4Intensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary5X
  */
-class ReadColorControlPrimary5X : public ModelCommand
+class ReadColorControlPrimary5X: public ModelCommand
 {
 public:
-    ReadColorControlPrimary5X() : ModelCommand("read")
+    ReadColorControlPrimary5X(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary5x");
         ModelCommand::AddArguments();
@@ -3512,8 +3343,8 @@ class ReadColorControlPrimary5X : public ModelCommand
 
     ~ReadColorControlPrimary5X()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3526,19 +3357,17 @@ class ReadColorControlPrimary5X : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary5Y
  */
-class ReadColorControlPrimary5Y : public ModelCommand
+class ReadColorControlPrimary5Y: public ModelCommand
 {
 public:
-    ReadColorControlPrimary5Y() : ModelCommand("read")
+    ReadColorControlPrimary5Y(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary5y");
         ModelCommand::AddArguments();
@@ -3546,8 +3375,8 @@ class ReadColorControlPrimary5Y : public ModelCommand
 
     ~ReadColorControlPrimary5Y()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3560,19 +3389,17 @@ class ReadColorControlPrimary5Y : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary5Intensity
  */
-class ReadColorControlPrimary5Intensity : public ModelCommand
+class ReadColorControlPrimary5Intensity: public ModelCommand
 {
 public:
-    ReadColorControlPrimary5Intensity() : ModelCommand("read")
+    ReadColorControlPrimary5Intensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary5intensity");
         ModelCommand::AddArguments();
@@ -3580,8 +3407,8 @@ class ReadColorControlPrimary5Intensity : public ModelCommand
 
     ~ReadColorControlPrimary5Intensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3594,19 +3421,17 @@ class ReadColorControlPrimary5Intensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary6X
  */
-class ReadColorControlPrimary6X : public ModelCommand
+class ReadColorControlPrimary6X: public ModelCommand
 {
 public:
-    ReadColorControlPrimary6X() : ModelCommand("read")
+    ReadColorControlPrimary6X(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary6x");
         ModelCommand::AddArguments();
@@ -3614,8 +3439,8 @@ class ReadColorControlPrimary6X : public ModelCommand
 
     ~ReadColorControlPrimary6X()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3628,19 +3453,17 @@ class ReadColorControlPrimary6X : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary6Y
  */
-class ReadColorControlPrimary6Y : public ModelCommand
+class ReadColorControlPrimary6Y: public ModelCommand
 {
 public:
-    ReadColorControlPrimary6Y() : ModelCommand("read")
+    ReadColorControlPrimary6Y(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary6y");
         ModelCommand::AddArguments();
@@ -3648,8 +3471,8 @@ class ReadColorControlPrimary6Y : public ModelCommand
 
     ~ReadColorControlPrimary6Y()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3662,19 +3485,17 @@ class ReadColorControlPrimary6Y : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Primary6Intensity
  */
-class ReadColorControlPrimary6Intensity : public ModelCommand
+class ReadColorControlPrimary6Intensity: public ModelCommand
 {
 public:
-    ReadColorControlPrimary6Intensity() : ModelCommand("read")
+    ReadColorControlPrimary6Intensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "primary6intensity");
         ModelCommand::AddArguments();
@@ -3682,8 +3503,8 @@ class ReadColorControlPrimary6Intensity : public ModelCommand
 
     ~ReadColorControlPrimary6Intensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3696,19 +3517,17 @@ class ReadColorControlPrimary6Intensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute WhitePointX
  */
-class ReadColorControlWhitePointX : public ModelCommand
+class ReadColorControlWhitePointX: public ModelCommand
 {
 public:
-    ReadColorControlWhitePointX() : ModelCommand("read")
+    ReadColorControlWhitePointX(): ModelCommand("read")
     {
         AddArgument("attr-name", "white-point-x");
         ModelCommand::AddArguments();
@@ -3716,8 +3535,8 @@ class ReadColorControlWhitePointX : public ModelCommand
 
     ~ReadColorControlWhitePointX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3730,16 +3549,14 @@ class ReadColorControlWhitePointX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlWhitePointX : public ModelCommand
+class WriteColorControlWhitePointX: public ModelCommand
 {
 public:
-    WriteColorControlWhitePointX() : ModelCommand("write")
+    WriteColorControlWhitePointX(): ModelCommand("write")
     {
         AddArgument("attr-name", "white-point-x");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -3748,8 +3565,8 @@ class WriteColorControlWhitePointX : public ModelCommand
 
     ~WriteColorControlWhitePointX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3762,20 +3579,18 @@ class WriteColorControlWhitePointX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute WhitePointY
  */
-class ReadColorControlWhitePointY : public ModelCommand
+class ReadColorControlWhitePointY: public ModelCommand
 {
 public:
-    ReadColorControlWhitePointY() : ModelCommand("read")
+    ReadColorControlWhitePointY(): ModelCommand("read")
     {
         AddArgument("attr-name", "white-point-y");
         ModelCommand::AddArguments();
@@ -3783,8 +3598,8 @@ class ReadColorControlWhitePointY : public ModelCommand
 
     ~ReadColorControlWhitePointY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3797,16 +3612,14 @@ class ReadColorControlWhitePointY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlWhitePointY : public ModelCommand
+class WriteColorControlWhitePointY: public ModelCommand
 {
 public:
-    WriteColorControlWhitePointY() : ModelCommand("write")
+    WriteColorControlWhitePointY(): ModelCommand("write")
     {
         AddArgument("attr-name", "white-point-y");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -3815,8 +3628,8 @@ class WriteColorControlWhitePointY : public ModelCommand
 
     ~WriteColorControlWhitePointY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3829,20 +3642,18 @@ class WriteColorControlWhitePointY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ColorPointRX
  */
-class ReadColorControlColorPointRX : public ModelCommand
+class ReadColorControlColorPointRX: public ModelCommand
 {
 public:
-    ReadColorControlColorPointRX() : ModelCommand("read")
+    ReadColorControlColorPointRX(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-rx");
         ModelCommand::AddArguments();
@@ -3850,8 +3661,8 @@ class ReadColorControlColorPointRX : public ModelCommand
 
     ~ReadColorControlColorPointRX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3864,16 +3675,14 @@ class ReadColorControlColorPointRX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointRX : public ModelCommand
+class WriteColorControlColorPointRX: public ModelCommand
 {
 public:
-    WriteColorControlColorPointRX() : ModelCommand("write")
+    WriteColorControlColorPointRX(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-rx");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -3882,8 +3691,8 @@ class WriteColorControlColorPointRX : public ModelCommand
 
     ~WriteColorControlColorPointRX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3896,20 +3705,18 @@ class WriteColorControlColorPointRX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ColorPointRY
  */
-class ReadColorControlColorPointRY : public ModelCommand
+class ReadColorControlColorPointRY: public ModelCommand
 {
 public:
-    ReadColorControlColorPointRY() : ModelCommand("read")
+    ReadColorControlColorPointRY(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-ry");
         ModelCommand::AddArguments();
@@ -3917,8 +3724,8 @@ class ReadColorControlColorPointRY : public ModelCommand
 
     ~ReadColorControlColorPointRY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3931,16 +3738,14 @@ class ReadColorControlColorPointRY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointRY : public ModelCommand
+class WriteColorControlColorPointRY: public ModelCommand
 {
 public:
-    WriteColorControlColorPointRY() : ModelCommand("write")
+    WriteColorControlColorPointRY(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-ry");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -3949,8 +3754,8 @@ class WriteColorControlColorPointRY : public ModelCommand
 
     ~WriteColorControlColorPointRY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3963,20 +3768,18 @@ class WriteColorControlColorPointRY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ColorPointRIntensity
  */
-class ReadColorControlColorPointRIntensity : public ModelCommand
+class ReadColorControlColorPointRIntensity: public ModelCommand
 {
 public:
-    ReadColorControlColorPointRIntensity() : ModelCommand("read")
+    ReadColorControlColorPointRIntensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-rintensity");
         ModelCommand::AddArguments();
@@ -3984,8 +3787,8 @@ class ReadColorControlColorPointRIntensity : public ModelCommand
 
     ~ReadColorControlColorPointRIntensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -3998,16 +3801,14 @@ class ReadColorControlColorPointRIntensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointRIntensity : public ModelCommand
+class WriteColorControlColorPointRIntensity: public ModelCommand
 {
 public:
-    WriteColorControlColorPointRIntensity() : ModelCommand("write")
+    WriteColorControlColorPointRIntensity(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-rintensity");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
@@ -4016,8 +3817,8 @@ class WriteColorControlColorPointRIntensity : public ModelCommand
 
     ~WriteColorControlColorPointRIntensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4030,20 +3831,18 @@ class WriteColorControlColorPointRIntensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mValue;
 };
 
 /*
  * Attribute ColorPointGX
  */
-class ReadColorControlColorPointGX : public ModelCommand
+class ReadColorControlColorPointGX: public ModelCommand
 {
 public:
-    ReadColorControlColorPointGX() : ModelCommand("read")
+    ReadColorControlColorPointGX(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-gx");
         ModelCommand::AddArguments();
@@ -4051,8 +3850,8 @@ class ReadColorControlColorPointGX : public ModelCommand
 
     ~ReadColorControlColorPointGX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4065,16 +3864,14 @@ class ReadColorControlColorPointGX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointGX : public ModelCommand
+class WriteColorControlColorPointGX: public ModelCommand
 {
 public:
-    WriteColorControlColorPointGX() : ModelCommand("write")
+    WriteColorControlColorPointGX(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-gx");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -4083,8 +3880,8 @@ class WriteColorControlColorPointGX : public ModelCommand
 
     ~WriteColorControlColorPointGX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4097,20 +3894,18 @@ class WriteColorControlColorPointGX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ColorPointGY
  */
-class ReadColorControlColorPointGY : public ModelCommand
+class ReadColorControlColorPointGY: public ModelCommand
 {
 public:
-    ReadColorControlColorPointGY() : ModelCommand("read")
+    ReadColorControlColorPointGY(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-gy");
         ModelCommand::AddArguments();
@@ -4118,8 +3913,8 @@ class ReadColorControlColorPointGY : public ModelCommand
 
     ~ReadColorControlColorPointGY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4132,16 +3927,14 @@ class ReadColorControlColorPointGY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointGY : public ModelCommand
+class WriteColorControlColorPointGY: public ModelCommand
 {
 public:
-    WriteColorControlColorPointGY() : ModelCommand("write")
+    WriteColorControlColorPointGY(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-gy");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -4150,8 +3943,8 @@ class WriteColorControlColorPointGY : public ModelCommand
 
     ~WriteColorControlColorPointGY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4164,20 +3957,18 @@ class WriteColorControlColorPointGY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ColorPointGIntensity
  */
-class ReadColorControlColorPointGIntensity : public ModelCommand
+class ReadColorControlColorPointGIntensity: public ModelCommand
 {
 public:
-    ReadColorControlColorPointGIntensity() : ModelCommand("read")
+    ReadColorControlColorPointGIntensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-gintensity");
         ModelCommand::AddArguments();
@@ -4185,8 +3976,8 @@ class ReadColorControlColorPointGIntensity : public ModelCommand
 
     ~ReadColorControlColorPointGIntensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4199,16 +3990,14 @@ class ReadColorControlColorPointGIntensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointGIntensity : public ModelCommand
+class WriteColorControlColorPointGIntensity: public ModelCommand
 {
 public:
-    WriteColorControlColorPointGIntensity() : ModelCommand("write")
+    WriteColorControlColorPointGIntensity(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-gintensity");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
@@ -4217,8 +4006,8 @@ class WriteColorControlColorPointGIntensity : public ModelCommand
 
     ~WriteColorControlColorPointGIntensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4231,20 +4020,18 @@ class WriteColorControlColorPointGIntensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mValue;
 };
 
 /*
  * Attribute ColorPointBX
  */
-class ReadColorControlColorPointBX : public ModelCommand
+class ReadColorControlColorPointBX: public ModelCommand
 {
 public:
-    ReadColorControlColorPointBX() : ModelCommand("read")
+    ReadColorControlColorPointBX(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-bx");
         ModelCommand::AddArguments();
@@ -4252,8 +4039,8 @@ class ReadColorControlColorPointBX : public ModelCommand
 
     ~ReadColorControlColorPointBX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4266,16 +4053,14 @@ class ReadColorControlColorPointBX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointBX : public ModelCommand
+class WriteColorControlColorPointBX: public ModelCommand
 {
 public:
-    WriteColorControlColorPointBX() : ModelCommand("write")
+    WriteColorControlColorPointBX(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-bx");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -4284,8 +4069,8 @@ class WriteColorControlColorPointBX : public ModelCommand
 
     ~WriteColorControlColorPointBX()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4298,20 +4083,18 @@ class WriteColorControlColorPointBX : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ColorPointBY
  */
-class ReadColorControlColorPointBY : public ModelCommand
+class ReadColorControlColorPointBY: public ModelCommand
 {
 public:
-    ReadColorControlColorPointBY() : ModelCommand("read")
+    ReadColorControlColorPointBY(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-by");
         ModelCommand::AddArguments();
@@ -4319,8 +4102,8 @@ class ReadColorControlColorPointBY : public ModelCommand
 
     ~ReadColorControlColorPointBY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4333,16 +4116,14 @@ class ReadColorControlColorPointBY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointBY : public ModelCommand
+class WriteColorControlColorPointBY: public ModelCommand
 {
 public:
-    WriteColorControlColorPointBY() : ModelCommand("write")
+    WriteColorControlColorPointBY(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-by");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -4351,8 +4132,8 @@ class WriteColorControlColorPointBY : public ModelCommand
 
     ~WriteColorControlColorPointBY()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4365,20 +4146,18 @@ class WriteColorControlColorPointBY : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ColorPointBIntensity
  */
-class ReadColorControlColorPointBIntensity : public ModelCommand
+class ReadColorControlColorPointBIntensity: public ModelCommand
 {
 public:
-    ReadColorControlColorPointBIntensity() : ModelCommand("read")
+    ReadColorControlColorPointBIntensity(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-point-bintensity");
         ModelCommand::AddArguments();
@@ -4386,8 +4165,8 @@ class ReadColorControlColorPointBIntensity : public ModelCommand
 
     ~ReadColorControlColorPointBIntensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4400,16 +4179,14 @@ class ReadColorControlColorPointBIntensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlColorPointBIntensity : public ModelCommand
+class WriteColorControlColorPointBIntensity: public ModelCommand
 {
 public:
-    WriteColorControlColorPointBIntensity() : ModelCommand("write")
+    WriteColorControlColorPointBIntensity(): ModelCommand("write")
     {
         AddArgument("attr-name", "color-point-bintensity");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
@@ -4418,8 +4195,8 @@ class WriteColorControlColorPointBIntensity : public ModelCommand
 
     ~WriteColorControlColorPointBIntensity()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4432,20 +4209,18 @@ class WriteColorControlColorPointBIntensity : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mValue;
 };
 
 /*
  * Attribute EnhancedCurrentHue
  */
-class ReadColorControlEnhancedCurrentHue : public ModelCommand
+class ReadColorControlEnhancedCurrentHue: public ModelCommand
 {
 public:
-    ReadColorControlEnhancedCurrentHue() : ModelCommand("read")
+    ReadColorControlEnhancedCurrentHue(): ModelCommand("read")
     {
         AddArgument("attr-name", "enhanced-current-hue");
         ModelCommand::AddArguments();
@@ -4453,8 +4228,8 @@ class ReadColorControlEnhancedCurrentHue : public ModelCommand
 
     ~ReadColorControlEnhancedCurrentHue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4467,19 +4242,17 @@ class ReadColorControlEnhancedCurrentHue : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute EnhancedColorMode
  */
-class ReadColorControlEnhancedColorMode : public ModelCommand
+class ReadColorControlEnhancedColorMode: public ModelCommand
 {
 public:
-    ReadColorControlEnhancedColorMode() : ModelCommand("read")
+    ReadColorControlEnhancedColorMode(): ModelCommand("read")
     {
         AddArgument("attr-name", "enhanced-color-mode");
         ModelCommand::AddArguments();
@@ -4487,8 +4260,8 @@ class ReadColorControlEnhancedColorMode : public ModelCommand
 
     ~ReadColorControlEnhancedColorMode()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4501,19 +4274,17 @@ class ReadColorControlEnhancedColorMode : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorLoopActive
  */
-class ReadColorControlColorLoopActive : public ModelCommand
+class ReadColorControlColorLoopActive: public ModelCommand
 {
 public:
-    ReadColorControlColorLoopActive() : ModelCommand("read")
+    ReadColorControlColorLoopActive(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-loop-active");
         ModelCommand::AddArguments();
@@ -4521,8 +4292,8 @@ class ReadColorControlColorLoopActive : public ModelCommand
 
     ~ReadColorControlColorLoopActive()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4535,19 +4306,17 @@ class ReadColorControlColorLoopActive : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorLoopDirection
  */
-class ReadColorControlColorLoopDirection : public ModelCommand
+class ReadColorControlColorLoopDirection: public ModelCommand
 {
 public:
-    ReadColorControlColorLoopDirection() : ModelCommand("read")
+    ReadColorControlColorLoopDirection(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-loop-direction");
         ModelCommand::AddArguments();
@@ -4555,8 +4324,8 @@ class ReadColorControlColorLoopDirection : public ModelCommand
 
     ~ReadColorControlColorLoopDirection()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4569,19 +4338,17 @@ class ReadColorControlColorLoopDirection : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorLoopTime
  */
-class ReadColorControlColorLoopTime : public ModelCommand
+class ReadColorControlColorLoopTime: public ModelCommand
 {
 public:
-    ReadColorControlColorLoopTime() : ModelCommand("read")
+    ReadColorControlColorLoopTime(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-loop-time");
         ModelCommand::AddArguments();
@@ -4589,8 +4356,8 @@ class ReadColorControlColorLoopTime : public ModelCommand
 
     ~ReadColorControlColorLoopTime()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4603,19 +4370,17 @@ class ReadColorControlColorLoopTime : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorCapabilities
  */
-class ReadColorControlColorCapabilities : public ModelCommand
+class ReadColorControlColorCapabilities: public ModelCommand
 {
 public:
-    ReadColorControlColorCapabilities() : ModelCommand("read")
+    ReadColorControlColorCapabilities(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-capabilities");
         ModelCommand::AddArguments();
@@ -4623,8 +4388,8 @@ class ReadColorControlColorCapabilities : public ModelCommand
 
     ~ReadColorControlColorCapabilities()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4637,19 +4402,17 @@ class ReadColorControlColorCapabilities : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorTempPhysicalMin
  */
-class ReadColorControlColorTempPhysicalMin : public ModelCommand
+class ReadColorControlColorTempPhysicalMin: public ModelCommand
 {
 public:
-    ReadColorControlColorTempPhysicalMin() : ModelCommand("read")
+    ReadColorControlColorTempPhysicalMin(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-temp-physical-min");
         ModelCommand::AddArguments();
@@ -4657,8 +4420,8 @@ class ReadColorControlColorTempPhysicalMin : public ModelCommand
 
     ~ReadColorControlColorTempPhysicalMin()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4671,19 +4434,17 @@ class ReadColorControlColorTempPhysicalMin : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ColorTempPhysicalMax
  */
-class ReadColorControlColorTempPhysicalMax : public ModelCommand
+class ReadColorControlColorTempPhysicalMax: public ModelCommand
 {
 public:
-    ReadColorControlColorTempPhysicalMax() : ModelCommand("read")
+    ReadColorControlColorTempPhysicalMax(): ModelCommand("read")
     {
         AddArgument("attr-name", "color-temp-physical-max");
         ModelCommand::AddArguments();
@@ -4691,8 +4452,8 @@ class ReadColorControlColorTempPhysicalMax : public ModelCommand
 
     ~ReadColorControlColorTempPhysicalMax()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4705,19 +4466,17 @@ class ReadColorControlColorTempPhysicalMax : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CoupleColorTempToLevelMinMireds
  */
-class ReadColorControlCoupleColorTempToLevelMinMireds : public ModelCommand
+class ReadColorControlCoupleColorTempToLevelMinMireds: public ModelCommand
 {
 public:
-    ReadColorControlCoupleColorTempToLevelMinMireds() : ModelCommand("read")
+    ReadColorControlCoupleColorTempToLevelMinMireds(): ModelCommand("read")
     {
         AddArgument("attr-name", "couple-color-temp-to-level-min-mireds");
         ModelCommand::AddArguments();
@@ -4725,8 +4484,8 @@ class ReadColorControlCoupleColorTempToLevelMinMireds : public ModelCommand
 
     ~ReadColorControlCoupleColorTempToLevelMinMireds()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4739,19 +4498,17 @@ class ReadColorControlCoupleColorTempToLevelMinMireds : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute StartUpColorTemperatureMireds
  */
-class ReadColorControlStartUpColorTemperatureMireds : public ModelCommand
+class ReadColorControlStartUpColorTemperatureMireds: public ModelCommand
 {
 public:
-    ReadColorControlStartUpColorTemperatureMireds() : ModelCommand("read")
+    ReadColorControlStartUpColorTemperatureMireds(): ModelCommand("read")
     {
         AddArgument("attr-name", "start-up-color-temperature-mireds");
         ModelCommand::AddArguments();
@@ -4759,8 +4516,8 @@ class ReadColorControlStartUpColorTemperatureMireds : public ModelCommand
 
     ~ReadColorControlStartUpColorTemperatureMireds()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4773,16 +4530,14 @@ class ReadColorControlStartUpColorTemperatureMireds : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteColorControlStartUpColorTemperatureMireds : public ModelCommand
+class WriteColorControlStartUpColorTemperatureMireds: public ModelCommand
 {
 public:
-    WriteColorControlStartUpColorTemperatureMireds() : ModelCommand("write")
+    WriteColorControlStartUpColorTemperatureMireds(): ModelCommand("write")
     {
         AddArgument("attr-name", "start-up-color-temperature-mireds");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -4791,8 +4546,8 @@ class WriteColorControlStartUpColorTemperatureMireds : public ModelCommand
 
     ~WriteColorControlStartUpColorTemperatureMireds()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4801,25 +4556,22 @@ class WriteColorControlStartUpColorTemperatureMireds : public ModelCommand
 
         chip::Controller::ColorControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.WriteAttributeStartUpColorTemperatureMireds(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                                                   mValue);
+        return cluster.WriteAttributeStartUpColorTemperatureMireds(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mValue);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadColorControlClusterRevision : public ModelCommand
+class ReadColorControlClusterRevision: public ModelCommand
 {
 public:
-    ReadColorControlClusterRevision() : ModelCommand("read")
+    ReadColorControlClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -4827,8 +4579,8 @@ class ReadColorControlClusterRevision : public ModelCommand
 
     ~ReadColorControlClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4841,10 +4593,8 @@ class ReadColorControlClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -4885,14 +4635,17 @@ class ReadColorControlClusterRevision : public ModelCommand
 /*
  * Command ClearAllPins
  */
-class DoorLockClearAllPins : public ModelCommand
+class DoorLockClearAllPins: public ModelCommand
 {
 public:
-    DoorLockClearAllPins() : ModelCommand("clear-all-pins") { ModelCommand::AddArguments(); }
+    DoorLockClearAllPins(): ModelCommand("clear-all-pins")
+    {
+        ModelCommand::AddArguments();
+    }
     ~DoorLockClearAllPins()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4905,23 +4658,24 @@ class DoorLockClearAllPins : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(OnDoorLockClusterClearAllPinsResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(OnDoorLockClusterClearAllPinsResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Command ClearAllRfids
  */
-class DoorLockClearAllRfids : public ModelCommand
+class DoorLockClearAllRfids: public ModelCommand
 {
 public:
-    DoorLockClearAllRfids() : ModelCommand("clear-all-rfids") { ModelCommand::AddArguments(); }
+    DoorLockClearAllRfids(): ModelCommand("clear-all-rfids")
+    {
+        ModelCommand::AddArguments();
+    }
     ~DoorLockClearAllRfids()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4934,27 +4688,25 @@ class DoorLockClearAllRfids : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(OnDoorLockClusterClearAllRfidsResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(OnDoorLockClusterClearAllRfidsResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Command ClearHolidaySchedule
  */
-class DoorLockClearHolidaySchedule : public ModelCommand
+class DoorLockClearHolidaySchedule: public ModelCommand
 {
 public:
-    DoorLockClearHolidaySchedule() : ModelCommand("clear-holiday-schedule")
+    DoorLockClearHolidaySchedule(): ModelCommand("clear-holiday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         ModelCommand::AddArguments();
     }
     ~DoorLockClearHolidaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -4967,29 +4719,26 @@ class DoorLockClearHolidaySchedule : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(
-            OnDoorLockClusterClearHolidayScheduleResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(OnDoorLockClusterClearHolidayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
 };
 
 /*
  * Command ClearPin
  */
-class DoorLockClearPin : public ModelCommand
+class DoorLockClearPin: public ModelCommand
 {
 public:
-    DoorLockClearPin() : ModelCommand("clear-pin")
+    DoorLockClearPin(): ModelCommand("clear-pin")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         ModelCommand::AddArguments();
     }
     ~DoorLockClearPin()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5002,28 +4751,26 @@ class DoorLockClearPin : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterClearPinResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterClearPinResponseCallback>(OnDoorLockClusterClearPinResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterClearPinResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterClearPinResponseCallback>(OnDoorLockClusterClearPinResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
 };
 
 /*
  * Command ClearRfid
  */
-class DoorLockClearRfid : public ModelCommand
+class DoorLockClearRfid: public ModelCommand
 {
 public:
-    DoorLockClearRfid() : ModelCommand("clear-rfid")
+    DoorLockClearRfid(): ModelCommand("clear-rfid")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         ModelCommand::AddArguments();
     }
     ~DoorLockClearRfid()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5036,20 +4783,18 @@ class DoorLockClearRfid : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterClearRfidResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterClearRfidResponseCallback>(OnDoorLockClusterClearRfidResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterClearRfidResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterClearRfidResponseCallback>(OnDoorLockClusterClearRfidResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
 };
 
 /*
  * Command ClearWeekdaySchedule
  */
-class DoorLockClearWeekdaySchedule : public ModelCommand
+class DoorLockClearWeekdaySchedule: public ModelCommand
 {
 public:
-    DoorLockClearWeekdaySchedule() : ModelCommand("clear-weekday-schedule")
+    DoorLockClearWeekdaySchedule(): ModelCommand("clear-weekday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
@@ -5057,8 +4802,8 @@ class DoorLockClearWeekdaySchedule : public ModelCommand
     }
     ~DoorLockClearWeekdaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5071,11 +4816,8 @@ class DoorLockClearWeekdaySchedule : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(
-            OnDoorLockClusterClearWeekdayScheduleResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(OnDoorLockClusterClearWeekdayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
     uint16_t mUserId;
 };
@@ -5083,10 +4825,10 @@ class DoorLockClearWeekdaySchedule : public ModelCommand
 /*
  * Command ClearYeardaySchedule
  */
-class DoorLockClearYeardaySchedule : public ModelCommand
+class DoorLockClearYeardaySchedule: public ModelCommand
 {
 public:
-    DoorLockClearYeardaySchedule() : ModelCommand("clear-yearday-schedule")
+    DoorLockClearYeardaySchedule(): ModelCommand("clear-yearday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
@@ -5094,8 +4836,8 @@ class DoorLockClearYeardaySchedule : public ModelCommand
     }
     ~DoorLockClearYeardaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5108,11 +4850,8 @@ class DoorLockClearYeardaySchedule : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(
-            OnDoorLockClusterClearYeardayScheduleResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(OnDoorLockClusterClearYeardayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
     uint16_t mUserId;
 };
@@ -5120,18 +4859,18 @@ class DoorLockClearYeardaySchedule : public ModelCommand
 /*
  * Command GetHolidaySchedule
  */
-class DoorLockGetHolidaySchedule : public ModelCommand
+class DoorLockGetHolidaySchedule: public ModelCommand
 {
 public:
-    DoorLockGetHolidaySchedule() : ModelCommand("get-holiday-schedule")
+    DoorLockGetHolidaySchedule(): ModelCommand("get-holiday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         ModelCommand::AddArguments();
     }
     ~DoorLockGetHolidaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5144,29 +4883,26 @@ class DoorLockGetHolidaySchedule : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(OnDoorLockClusterGetHolidayScheduleResponse,
-                                                                                        this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(OnDoorLockClusterGetHolidayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
 };
 
 /*
  * Command GetLogRecord
  */
-class DoorLockGetLogRecord : public ModelCommand
+class DoorLockGetLogRecord: public ModelCommand
 {
 public:
-    DoorLockGetLogRecord() : ModelCommand("get-log-record")
+    DoorLockGetLogRecord(): ModelCommand("get-log-record")
     {
         AddArgument("logIndex", 0, UINT16_MAX, &mLogIndex);
         ModelCommand::AddArguments();
     }
     ~DoorLockGetLogRecord()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5179,28 +4915,26 @@ class DoorLockGetLogRecord : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(OnDoorLockClusterGetLogRecordResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(OnDoorLockClusterGetLogRecordResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mLogIndex;
 };
 
 /*
  * Command GetPin
  */
-class DoorLockGetPin : public ModelCommand
+class DoorLockGetPin: public ModelCommand
 {
 public:
-    DoorLockGetPin() : ModelCommand("get-pin")
+    DoorLockGetPin(): ModelCommand("get-pin")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         ModelCommand::AddArguments();
     }
     ~DoorLockGetPin()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5213,28 +4947,26 @@ class DoorLockGetPin : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterGetPinResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterGetPinResponseCallback>(OnDoorLockClusterGetPinResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterGetPinResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterGetPinResponseCallback>(OnDoorLockClusterGetPinResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
 };
 
 /*
  * Command GetRfid
  */
-class DoorLockGetRfid : public ModelCommand
+class DoorLockGetRfid: public ModelCommand
 {
 public:
-    DoorLockGetRfid() : ModelCommand("get-rfid")
+    DoorLockGetRfid(): ModelCommand("get-rfid")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         ModelCommand::AddArguments();
     }
     ~DoorLockGetRfid()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5247,28 +4979,26 @@ class DoorLockGetRfid : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterGetRfidResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterGetRfidResponseCallback>(OnDoorLockClusterGetRfidResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterGetRfidResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterGetRfidResponseCallback>(OnDoorLockClusterGetRfidResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
 };
 
 /*
  * Command GetUserType
  */
-class DoorLockGetUserType : public ModelCommand
+class DoorLockGetUserType: public ModelCommand
 {
 public:
-    DoorLockGetUserType() : ModelCommand("get-user-type")
+    DoorLockGetUserType(): ModelCommand("get-user-type")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         ModelCommand::AddArguments();
     }
     ~DoorLockGetUserType()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5281,20 +5011,18 @@ class DoorLockGetUserType : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(OnDoorLockClusterGetUserTypeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(OnDoorLockClusterGetUserTypeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
 };
 
 /*
  * Command GetWeekdaySchedule
  */
-class DoorLockGetWeekdaySchedule : public ModelCommand
+class DoorLockGetWeekdaySchedule: public ModelCommand
 {
 public:
-    DoorLockGetWeekdaySchedule() : ModelCommand("get-weekday-schedule")
+    DoorLockGetWeekdaySchedule(): ModelCommand("get-weekday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
@@ -5302,8 +5030,8 @@ class DoorLockGetWeekdaySchedule : public ModelCommand
     }
     ~DoorLockGetWeekdaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5316,11 +5044,8 @@ class DoorLockGetWeekdaySchedule : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(OnDoorLockClusterGetWeekdayScheduleResponse,
-                                                                                        this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(OnDoorLockClusterGetWeekdayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
     uint16_t mUserId;
 };
@@ -5328,10 +5053,10 @@ class DoorLockGetWeekdaySchedule : public ModelCommand
 /*
  * Command GetYeardaySchedule
  */
-class DoorLockGetYeardaySchedule : public ModelCommand
+class DoorLockGetYeardaySchedule: public ModelCommand
 {
 public:
-    DoorLockGetYeardaySchedule() : ModelCommand("get-yearday-schedule")
+    DoorLockGetYeardaySchedule(): ModelCommand("get-yearday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
@@ -5339,8 +5064,8 @@ class DoorLockGetYeardaySchedule : public ModelCommand
     }
     ~DoorLockGetYeardaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5353,11 +5078,8 @@ class DoorLockGetYeardaySchedule : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(OnDoorLockClusterGetYeardayScheduleResponse,
-                                                                                        this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(OnDoorLockClusterGetYeardayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
     uint16_t mUserId;
 };
@@ -5365,18 +5087,18 @@ class DoorLockGetYeardaySchedule : public ModelCommand
 /*
  * Command LockDoor
  */
-class DoorLockLockDoor : public ModelCommand
+class DoorLockLockDoor: public ModelCommand
 {
 public:
-    DoorLockLockDoor() : ModelCommand("lock-door")
+    DoorLockLockDoor(): ModelCommand("lock-door")
     {
         AddArgument("pin", &mPin);
         ModelCommand::AddArguments();
     }
     ~DoorLockLockDoor()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5385,25 +5107,22 @@ class DoorLockLockDoor : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.LockDoor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
+        return cluster.LockDoor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),  chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterLockDoorResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterLockDoorResponseCallback>(OnDoorLockClusterLockDoorResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterLockDoorResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterLockDoorResponseCallback>(OnDoorLockClusterLockDoorResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     char * mPin;
 };
 
 /*
  * Command SetHolidaySchedule
  */
-class DoorLockSetHolidaySchedule : public ModelCommand
+class DoorLockSetHolidaySchedule: public ModelCommand
 {
 public:
-    DoorLockSetHolidaySchedule() : ModelCommand("set-holiday-schedule")
+    DoorLockSetHolidaySchedule(): ModelCommand("set-holiday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         AddArgument("localStartTime", 0, UINT32_MAX, &mLocalStartTime);
@@ -5413,8 +5132,8 @@ class DoorLockSetHolidaySchedule : public ModelCommand
     }
     ~DoorLockSetHolidaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5423,16 +5142,12 @@ class DoorLockSetHolidaySchedule : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.SetHolidaySchedule(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mScheduleId, mLocalStartTime,
-                                          mLocalEndTime, mOperatingModeDuringHoliday);
+        return cluster.SetHolidaySchedule(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mScheduleId, mLocalStartTime, mLocalEndTime, mOperatingModeDuringHoliday);
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(OnDoorLockClusterSetHolidayScheduleResponse,
-                                                                                        this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(OnDoorLockClusterSetHolidayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
     uint32_t mLocalStartTime;
     uint32_t mLocalEndTime;
@@ -5442,10 +5157,10 @@ class DoorLockSetHolidaySchedule : public ModelCommand
 /*
  * Command SetPin
  */
-class DoorLockSetPin : public ModelCommand
+class DoorLockSetPin: public ModelCommand
 {
 public:
-    DoorLockSetPin() : ModelCommand("set-pin")
+    DoorLockSetPin(): ModelCommand("set-pin")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         AddArgument("userStatus", 0, UINT8_MAX, &mUserStatus);
@@ -5455,8 +5170,8 @@ class DoorLockSetPin : public ModelCommand
     }
     ~DoorLockSetPin()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5465,15 +5180,12 @@ class DoorLockSetPin : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.SetPin(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mUserId, mUserStatus, mUserType,
-                              chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
+        return cluster.SetPin(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mUserId, mUserStatus, mUserType,  chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterSetPinResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterSetPinResponseCallback>(OnDoorLockClusterSetPinResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterSetPinResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterSetPinResponseCallback>(OnDoorLockClusterSetPinResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
     uint8_t mUserStatus;
     uint8_t mUserType;
@@ -5483,10 +5195,10 @@ class DoorLockSetPin : public ModelCommand
 /*
  * Command SetRfid
  */
-class DoorLockSetRfid : public ModelCommand
+class DoorLockSetRfid: public ModelCommand
 {
 public:
-    DoorLockSetRfid() : ModelCommand("set-rfid")
+    DoorLockSetRfid(): ModelCommand("set-rfid")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         AddArgument("userStatus", 0, UINT8_MAX, &mUserStatus);
@@ -5496,8 +5208,8 @@ class DoorLockSetRfid : public ModelCommand
     }
     ~DoorLockSetRfid()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5506,15 +5218,12 @@ class DoorLockSetRfid : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.SetRfid(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mUserId, mUserStatus, mUserType,
-                               chip::ByteSpan(chip::Uint8::from_char(mId), strlen(mId)));
+        return cluster.SetRfid(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mUserId, mUserStatus, mUserType,  chip::ByteSpan(chip::Uint8::from_char(mId), strlen(mId)));
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterSetRfidResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterSetRfidResponseCallback>(OnDoorLockClusterSetRfidResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterSetRfidResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterSetRfidResponseCallback>(OnDoorLockClusterSetRfidResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
     uint8_t mUserStatus;
     uint8_t mUserType;
@@ -5524,10 +5233,10 @@ class DoorLockSetRfid : public ModelCommand
 /*
  * Command SetUserType
  */
-class DoorLockSetUserType : public ModelCommand
+class DoorLockSetUserType: public ModelCommand
 {
 public:
-    DoorLockSetUserType() : ModelCommand("set-user-type")
+    DoorLockSetUserType(): ModelCommand("set-user-type")
     {
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
         AddArgument("userType", 0, UINT8_MAX, &mUserType);
@@ -5535,8 +5244,8 @@ class DoorLockSetUserType : public ModelCommand
     }
     ~DoorLockSetUserType()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5549,10 +5258,8 @@ class DoorLockSetUserType : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(OnDoorLockClusterSetUserTypeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(OnDoorLockClusterSetUserTypeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mUserId;
     uint8_t mUserType;
 };
@@ -5560,10 +5267,10 @@ class DoorLockSetUserType : public ModelCommand
 /*
  * Command SetWeekdaySchedule
  */
-class DoorLockSetWeekdaySchedule : public ModelCommand
+class DoorLockSetWeekdaySchedule: public ModelCommand
 {
 public:
-    DoorLockSetWeekdaySchedule() : ModelCommand("set-weekday-schedule")
+    DoorLockSetWeekdaySchedule(): ModelCommand("set-weekday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
@@ -5576,8 +5283,8 @@ class DoorLockSetWeekdaySchedule : public ModelCommand
     }
     ~DoorLockSetWeekdaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5586,16 +5293,12 @@ class DoorLockSetWeekdaySchedule : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.SetWeekdaySchedule(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mScheduleId, mUserId, mDaysMask,
-                                          mStartHour, mStartMinute, mEndHour, mEndMinute);
+        return cluster.SetWeekdaySchedule(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mScheduleId, mUserId, mDaysMask, mStartHour, mStartMinute, mEndHour, mEndMinute);
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(OnDoorLockClusterSetWeekdayScheduleResponse,
-                                                                                        this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(OnDoorLockClusterSetWeekdayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
     uint16_t mUserId;
     uint8_t mDaysMask;
@@ -5608,10 +5311,10 @@ class DoorLockSetWeekdaySchedule : public ModelCommand
 /*
  * Command SetYeardaySchedule
  */
-class DoorLockSetYeardaySchedule : public ModelCommand
+class DoorLockSetYeardaySchedule: public ModelCommand
 {
 public:
-    DoorLockSetYeardaySchedule() : ModelCommand("set-yearday-schedule")
+    DoorLockSetYeardaySchedule(): ModelCommand("set-yearday-schedule")
     {
         AddArgument("scheduleId", 0, UINT8_MAX, &mScheduleId);
         AddArgument("userId", 0, UINT16_MAX, &mUserId);
@@ -5621,8 +5324,8 @@ class DoorLockSetYeardaySchedule : public ModelCommand
     }
     ~DoorLockSetYeardaySchedule()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5631,16 +5334,12 @@ class DoorLockSetYeardaySchedule : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.SetYeardaySchedule(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mScheduleId, mUserId,
-                                          mLocalStartTime, mLocalEndTime);
+        return cluster.SetYeardaySchedule(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mScheduleId, mUserId, mLocalStartTime, mLocalEndTime);
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(OnDoorLockClusterSetYeardayScheduleResponse,
-                                                                                        this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(OnDoorLockClusterSetYeardayScheduleResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mScheduleId;
     uint16_t mUserId;
     uint32_t mLocalStartTime;
@@ -5650,18 +5349,18 @@ class DoorLockSetYeardaySchedule : public ModelCommand
 /*
  * Command UnlockDoor
  */
-class DoorLockUnlockDoor : public ModelCommand
+class DoorLockUnlockDoor: public ModelCommand
 {
 public:
-    DoorLockUnlockDoor() : ModelCommand("unlock-door")
+    DoorLockUnlockDoor(): ModelCommand("unlock-door")
     {
         AddArgument("pin", &mPin);
         ModelCommand::AddArguments();
     }
     ~DoorLockUnlockDoor()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5670,25 +5369,22 @@ class DoorLockUnlockDoor : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.UnlockDoor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                  chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
+        return cluster.UnlockDoor(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),  chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(OnDoorLockClusterUnlockDoorResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(OnDoorLockClusterUnlockDoorResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     char * mPin;
 };
 
 /*
  * Command UnlockWithTimeout
  */
-class DoorLockUnlockWithTimeout : public ModelCommand
+class DoorLockUnlockWithTimeout: public ModelCommand
 {
 public:
-    DoorLockUnlockWithTimeout() : ModelCommand("unlock-with-timeout")
+    DoorLockUnlockWithTimeout(): ModelCommand("unlock-with-timeout")
     {
         AddArgument("timeoutInSeconds", 0, UINT16_MAX, &mTimeoutInSeconds);
         AddArgument("pin", &mPin);
@@ -5696,8 +5392,8 @@ class DoorLockUnlockWithTimeout : public ModelCommand
     }
     ~DoorLockUnlockWithTimeout()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5706,32 +5402,32 @@ class DoorLockUnlockWithTimeout : public ModelCommand
 
         chip::Controller::DoorLockCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.UnlockWithTimeout(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mTimeoutInSeconds,
-                                         chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
+        return cluster.UnlockWithTimeout(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mTimeoutInSeconds,  chip::ByteSpan(chip::Uint8::from_char(mPin), strlen(mPin)));
     }
 
 private:
-    chip::Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(OnDoorLockClusterUnlockWithTimeoutResponse,
-                                                                                       this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> * onSuccessCallback = new chip::Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(OnDoorLockClusterUnlockWithTimeoutResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mTimeoutInSeconds;
     char * mPin;
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverDoorLockAttributes : public ModelCommand
+class DiscoverDoorLockAttributes: public ModelCommand
 {
 public:
-    DiscoverDoorLockAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverDoorLockAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverDoorLockAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5744,19 +5440,17 @@ class DiscoverDoorLockAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute LockState
  */
-class ReadDoorLockLockState : public ModelCommand
+class ReadDoorLockLockState: public ModelCommand
 {
 public:
-    ReadDoorLockLockState() : ModelCommand("read")
+    ReadDoorLockLockState(): ModelCommand("read")
     {
         AddArgument("attr-name", "lock-state");
         ModelCommand::AddArguments();
@@ -5764,8 +5458,8 @@ class ReadDoorLockLockState : public ModelCommand
 
     ~ReadDoorLockLockState()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5778,16 +5472,14 @@ class ReadDoorLockLockState : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportDoorLockLockState : public ModelCommand
+class ReportDoorLockLockState: public ModelCommand
 {
 public:
-    ReportDoorLockLockState() : ModelCommand("report")
+    ReportDoorLockLockState(): ModelCommand("report")
     {
         AddArgument("attr-name", "lock-state");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -5797,9 +5489,9 @@ class ReportDoorLockLockState : public ModelCommand
 
     ~ReportDoorLockLockState()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5815,17 +5507,13 @@ class ReportDoorLockLockState : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeLockState(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                   mMaxInterval);
+        return cluster.ConfigureAttributeLockState(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
 };
@@ -5833,10 +5521,10 @@ class ReportDoorLockLockState : public ModelCommand
 /*
  * Attribute LockType
  */
-class ReadDoorLockLockType : public ModelCommand
+class ReadDoorLockLockType: public ModelCommand
 {
 public:
-    ReadDoorLockLockType() : ModelCommand("read")
+    ReadDoorLockLockType(): ModelCommand("read")
     {
         AddArgument("attr-name", "lock-type");
         ModelCommand::AddArguments();
@@ -5844,8 +5532,8 @@ class ReadDoorLockLockType : public ModelCommand
 
     ~ReadDoorLockLockType()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5858,19 +5546,17 @@ class ReadDoorLockLockType : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ActuatorEnabled
  */
-class ReadDoorLockActuatorEnabled : public ModelCommand
+class ReadDoorLockActuatorEnabled: public ModelCommand
 {
 public:
-    ReadDoorLockActuatorEnabled() : ModelCommand("read")
+    ReadDoorLockActuatorEnabled(): ModelCommand("read")
     {
         AddArgument("attr-name", "actuator-enabled");
         ModelCommand::AddArguments();
@@ -5878,8 +5564,8 @@ class ReadDoorLockActuatorEnabled : public ModelCommand
 
     ~ReadDoorLockActuatorEnabled()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5892,19 +5578,17 @@ class ReadDoorLockActuatorEnabled : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<BooleanAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<BooleanAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadDoorLockClusterRevision : public ModelCommand
+class ReadDoorLockClusterRevision: public ModelCommand
 {
 public:
-    ReadDoorLockClusterRevision() : ModelCommand("read")
+    ReadDoorLockClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -5912,8 +5596,8 @@ class ReadDoorLockClusterRevision : public ModelCommand
 
     ~ReadDoorLockClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5926,10 +5610,8 @@ class ReadDoorLockClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -5949,10 +5631,10 @@ class ReadDoorLockClusterRevision : public ModelCommand
 /*
  * Command ArmFailSafe
  */
-class GeneralCommissioningArmFailSafe : public ModelCommand
+class GeneralCommissioningArmFailSafe: public ModelCommand
 {
 public:
-    GeneralCommissioningArmFailSafe() : ModelCommand("arm-fail-safe")
+    GeneralCommissioningArmFailSafe(): ModelCommand("arm-fail-safe")
     {
         AddArgument("expiryLengthSeconds", 0, UINT16_MAX, &mExpiryLengthSeconds);
         AddArgument("breadcrumb", 0, UINT64_MAX, &mBreadcrumb);
@@ -5961,8 +5643,8 @@ class GeneralCommissioningArmFailSafe : public ModelCommand
     }
     ~GeneralCommissioningArmFailSafe()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -5971,16 +5653,12 @@ class GeneralCommissioningArmFailSafe : public ModelCommand
 
         chip::Controller::GeneralCommissioningCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.ArmFailSafe(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mExpiryLengthSeconds, mBreadcrumb,
-                                   mTimeoutMs);
+        return cluster.ArmFailSafe(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mExpiryLengthSeconds, mBreadcrumb, mTimeoutMs);
     }
 
 private:
-    chip::Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(
-            OnGeneralCommissioningClusterArmFailSafeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> * onSuccessCallback = new chip::Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(OnGeneralCommissioningClusterArmFailSafeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mExpiryLengthSeconds;
     uint64_t mBreadcrumb;
     uint32_t mTimeoutMs;
@@ -5989,14 +5667,17 @@ class GeneralCommissioningArmFailSafe : public ModelCommand
 /*
  * Command CommissioningComplete
  */
-class GeneralCommissioningCommissioningComplete : public ModelCommand
+class GeneralCommissioningCommissioningComplete: public ModelCommand
 {
 public:
-    GeneralCommissioningCommissioningComplete() : ModelCommand("commissioning-complete") { ModelCommand::AddArguments(); }
+    GeneralCommissioningCommissioningComplete(): ModelCommand("commissioning-complete")
+    {
+        ModelCommand::AddArguments();
+    }
     ~GeneralCommissioningCommissioningComplete()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6009,20 +5690,17 @@ class GeneralCommissioningCommissioningComplete : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(
-            OnGeneralCommissioningClusterCommissioningCompleteResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> * onSuccessCallback = new chip::Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(OnGeneralCommissioningClusterCommissioningCompleteResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Command SetFabric
  */
-class GeneralCommissioningSetFabric : public ModelCommand
+class GeneralCommissioningSetFabric: public ModelCommand
 {
 public:
-    GeneralCommissioningSetFabric() : ModelCommand("set-fabric")
+    GeneralCommissioningSetFabric(): ModelCommand("set-fabric")
     {
         AddArgument("fabricId", &mFabricId);
         AddArgument("fabricSecret", &mFabricSecret);
@@ -6032,8 +5710,8 @@ class GeneralCommissioningSetFabric : public ModelCommand
     }
     ~GeneralCommissioningSetFabric()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6042,36 +5720,34 @@ class GeneralCommissioningSetFabric : public ModelCommand
 
         chip::Controller::GeneralCommissioningCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.SetFabric(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                 chip::ByteSpan(chip::Uint8::from_char(mFabricId), strlen(mFabricId)),
-                                 chip::ByteSpan(chip::Uint8::from_char(mFabricSecret), strlen(mFabricSecret)), mBreadcrumb,
-                                 mTimeoutMs);
+        return cluster.SetFabric(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),  chip::ByteSpan(chip::Uint8::from_char(mFabricId), strlen(mFabricId)),  chip::ByteSpan(chip::Uint8::from_char(mFabricSecret), strlen(mFabricSecret)), mBreadcrumb, mTimeoutMs);
     }
 
 private:
-    chip::Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>(
-            OnGeneralCommissioningClusterSetFabricResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> * onSuccessCallback = new chip::Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>(OnGeneralCommissioningClusterSetFabricResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     char * mFabricId;
     char * mFabricSecret;
     uint64_t mBreadcrumb;
     uint32_t mTimeoutMs;
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverGeneralCommissioningAttributes : public ModelCommand
+class DiscoverGeneralCommissioningAttributes: public ModelCommand
 {
 public:
-    DiscoverGeneralCommissioningAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverGeneralCommissioningAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverGeneralCommissioningAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6084,19 +5760,17 @@ class DiscoverGeneralCommissioningAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute FabricId
  */
-class ReadGeneralCommissioningFabricId : public ModelCommand
+class ReadGeneralCommissioningFabricId: public ModelCommand
 {
 public:
-    ReadGeneralCommissioningFabricId() : ModelCommand("read")
+    ReadGeneralCommissioningFabricId(): ModelCommand("read")
     {
         AddArgument("attr-name", "fabric-id");
         ModelCommand::AddArguments();
@@ -6104,8 +5778,8 @@ class ReadGeneralCommissioningFabricId : public ModelCommand
 
     ~ReadGeneralCommissioningFabricId()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6118,19 +5792,17 @@ class ReadGeneralCommissioningFabricId : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<StringAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<StringAttributeCallback>(OnStringAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute Breadcrumb
  */
-class ReadGeneralCommissioningBreadcrumb : public ModelCommand
+class ReadGeneralCommissioningBreadcrumb: public ModelCommand
 {
 public:
-    ReadGeneralCommissioningBreadcrumb() : ModelCommand("read")
+    ReadGeneralCommissioningBreadcrumb(): ModelCommand("read")
     {
         AddArgument("attr-name", "breadcrumb");
         ModelCommand::AddArguments();
@@ -6138,8 +5810,8 @@ class ReadGeneralCommissioningBreadcrumb : public ModelCommand
 
     ~ReadGeneralCommissioningBreadcrumb()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6152,16 +5824,14 @@ class ReadGeneralCommissioningBreadcrumb : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int64uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int64uAttributeCallback>(OnInt64uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int64uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int64uAttributeCallback>(OnInt64uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteGeneralCommissioningBreadcrumb : public ModelCommand
+class WriteGeneralCommissioningBreadcrumb: public ModelCommand
 {
 public:
-    WriteGeneralCommissioningBreadcrumb() : ModelCommand("write")
+    WriteGeneralCommissioningBreadcrumb(): ModelCommand("write")
     {
         AddArgument("attr-name", "breadcrumb");
         AddArgument("attr-value", 0, UINT64_MAX, &mValue);
@@ -6170,8 +5840,8 @@ class WriteGeneralCommissioningBreadcrumb : public ModelCommand
 
     ~WriteGeneralCommissioningBreadcrumb()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6184,20 +5854,18 @@ class WriteGeneralCommissioningBreadcrumb : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint64_t mValue;
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadGeneralCommissioningClusterRevision : public ModelCommand
+class ReadGeneralCommissioningClusterRevision: public ModelCommand
 {
 public:
-    ReadGeneralCommissioningClusterRevision() : ModelCommand("read")
+    ReadGeneralCommissioningClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -6205,8 +5873,8 @@ class ReadGeneralCommissioningClusterRevision : public ModelCommand
 
     ~ReadGeneralCommissioningClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6219,10 +5887,8 @@ class ReadGeneralCommissioningClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -6244,10 +5910,10 @@ class ReadGeneralCommissioningClusterRevision : public ModelCommand
 /*
  * Command AddGroup
  */
-class GroupsAddGroup : public ModelCommand
+class GroupsAddGroup: public ModelCommand
 {
 public:
-    GroupsAddGroup() : ModelCommand("add-group")
+    GroupsAddGroup(): ModelCommand("add-group")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         AddArgument("groupName", &mGroupName);
@@ -6255,8 +5921,8 @@ class GroupsAddGroup : public ModelCommand
     }
     ~GroupsAddGroup()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6265,15 +5931,12 @@ class GroupsAddGroup : public ModelCommand
 
         chip::Controller::GroupsCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.AddGroup(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mGroupId,
-                                chip::ByteSpan(chip::Uint8::from_char(mGroupName), strlen(mGroupName)));
+        return cluster.AddGroup(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mGroupId,  chip::ByteSpan(chip::Uint8::from_char(mGroupName), strlen(mGroupName)));
     }
 
 private:
-    chip::Callback::Callback<GroupsClusterAddGroupResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<GroupsClusterAddGroupResponseCallback>(OnGroupsClusterAddGroupResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<GroupsClusterAddGroupResponseCallback> * onSuccessCallback = new chip::Callback::Callback<GroupsClusterAddGroupResponseCallback>(OnGroupsClusterAddGroupResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
     char * mGroupName;
 };
@@ -6281,10 +5944,10 @@ class GroupsAddGroup : public ModelCommand
 /*
  * Command AddGroupIfIdentifying
  */
-class GroupsAddGroupIfIdentifying : public ModelCommand
+class GroupsAddGroupIfIdentifying: public ModelCommand
 {
 public:
-    GroupsAddGroupIfIdentifying() : ModelCommand("add-group-if-identifying")
+    GroupsAddGroupIfIdentifying(): ModelCommand("add-group-if-identifying")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         AddArgument("groupName", &mGroupName);
@@ -6292,8 +5955,8 @@ class GroupsAddGroupIfIdentifying : public ModelCommand
     }
     ~GroupsAddGroupIfIdentifying()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6302,15 +5965,12 @@ class GroupsAddGroupIfIdentifying : public ModelCommand
 
         chip::Controller::GroupsCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.AddGroupIfIdentifying(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mGroupId,
-                                             chip::ByteSpan(chip::Uint8::from_char(mGroupName), strlen(mGroupName)));
+        return cluster.AddGroupIfIdentifying(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mGroupId,  chip::ByteSpan(chip::Uint8::from_char(mGroupName), strlen(mGroupName)));
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
     char * mGroupName;
 };
@@ -6318,10 +5978,10 @@ class GroupsAddGroupIfIdentifying : public ModelCommand
 /*
  * Command GetGroupMembership
  */
-class GroupsGetGroupMembership : public ModelCommand
+class GroupsGetGroupMembership: public ModelCommand
 {
 public:
-    GroupsGetGroupMembership() : ModelCommand("get-group-membership")
+    GroupsGetGroupMembership(): ModelCommand("get-group-membership")
     {
         AddArgument("groupCount", 0, UINT8_MAX, &mGroupCount);
         AddArgument("groupList", 0, UINT16_MAX, &mGroupList);
@@ -6329,8 +5989,8 @@ class GroupsGetGroupMembership : public ModelCommand
     }
     ~GroupsGetGroupMembership()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6343,11 +6003,8 @@ class GroupsGetGroupMembership : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(OnGroupsClusterGetGroupMembershipResponse,
-                                                                                      this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> * onSuccessCallback = new chip::Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(OnGroupsClusterGetGroupMembershipResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mGroupCount;
     uint16_t mGroupList;
 };
@@ -6355,14 +6012,17 @@ class GroupsGetGroupMembership : public ModelCommand
 /*
  * Command RemoveAllGroups
  */
-class GroupsRemoveAllGroups : public ModelCommand
+class GroupsRemoveAllGroups: public ModelCommand
 {
 public:
-    GroupsRemoveAllGroups() : ModelCommand("remove-all-groups") { ModelCommand::AddArguments(); }
+    GroupsRemoveAllGroups(): ModelCommand("remove-all-groups")
+    {
+        ModelCommand::AddArguments();
+    }
     ~GroupsRemoveAllGroups()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6375,27 +6035,25 @@ class GroupsRemoveAllGroups : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Command RemoveGroup
  */
-class GroupsRemoveGroup : public ModelCommand
+class GroupsRemoveGroup: public ModelCommand
 {
 public:
-    GroupsRemoveGroup() : ModelCommand("remove-group")
+    GroupsRemoveGroup(): ModelCommand("remove-group")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         ModelCommand::AddArguments();
     }
     ~GroupsRemoveGroup()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6408,28 +6066,26 @@ class GroupsRemoveGroup : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<GroupsClusterRemoveGroupResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(OnGroupsClusterRemoveGroupResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<GroupsClusterRemoveGroupResponseCallback> * onSuccessCallback = new chip::Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(OnGroupsClusterRemoveGroupResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
 };
 
 /*
  * Command ViewGroup
  */
-class GroupsViewGroup : public ModelCommand
+class GroupsViewGroup: public ModelCommand
 {
 public:
-    GroupsViewGroup() : ModelCommand("view-group")
+    GroupsViewGroup(): ModelCommand("view-group")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         ModelCommand::AddArguments();
     }
     ~GroupsViewGroup()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6442,25 +6098,27 @@ class GroupsViewGroup : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<GroupsClusterViewGroupResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<GroupsClusterViewGroupResponseCallback>(OnGroupsClusterViewGroupResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<GroupsClusterViewGroupResponseCallback> * onSuccessCallback = new chip::Callback::Callback<GroupsClusterViewGroupResponseCallback>(OnGroupsClusterViewGroupResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverGroupsAttributes : public ModelCommand
+class DiscoverGroupsAttributes: public ModelCommand
 {
 public:
-    DiscoverGroupsAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverGroupsAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverGroupsAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6473,19 +6131,17 @@ class DiscoverGroupsAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute NameSupport
  */
-class ReadGroupsNameSupport : public ModelCommand
+class ReadGroupsNameSupport: public ModelCommand
 {
 public:
-    ReadGroupsNameSupport() : ModelCommand("read")
+    ReadGroupsNameSupport(): ModelCommand("read")
     {
         AddArgument("attr-name", "name-support");
         ModelCommand::AddArguments();
@@ -6493,8 +6149,8 @@ class ReadGroupsNameSupport : public ModelCommand
 
     ~ReadGroupsNameSupport()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6507,19 +6163,17 @@ class ReadGroupsNameSupport : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadGroupsClusterRevision : public ModelCommand
+class ReadGroupsClusterRevision: public ModelCommand
 {
 public:
-    ReadGroupsClusterRevision() : ModelCommand("read")
+    ReadGroupsClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -6527,8 +6181,8 @@ class ReadGroupsClusterRevision : public ModelCommand
 
     ~ReadGroupsClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6541,10 +6195,8 @@ class ReadGroupsClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -6562,18 +6214,18 @@ class ReadGroupsClusterRevision : public ModelCommand
 /*
  * Command Identify
  */
-class IdentifyIdentify : public ModelCommand
+class IdentifyIdentify: public ModelCommand
 {
 public:
-    IdentifyIdentify() : ModelCommand("identify")
+    IdentifyIdentify(): ModelCommand("identify")
     {
         AddArgument("identifyTime", 0, UINT16_MAX, &mIdentifyTime);
         ModelCommand::AddArguments();
     }
     ~IdentifyIdentify()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6586,24 +6238,25 @@ class IdentifyIdentify : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mIdentifyTime;
 };
 
 /*
  * Command IdentifyQuery
  */
-class IdentifyIdentifyQuery : public ModelCommand
+class IdentifyIdentifyQuery: public ModelCommand
 {
 public:
-    IdentifyIdentifyQuery() : ModelCommand("identify-query") { ModelCommand::AddArguments(); }
+    IdentifyIdentifyQuery(): ModelCommand("identify-query")
+    {
+        ModelCommand::AddArguments();
+    }
     ~IdentifyIdentifyQuery()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6616,24 +6269,26 @@ class IdentifyIdentifyQuery : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(OnIdentifyClusterIdentifyQueryResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> * onSuccessCallback = new chip::Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(OnIdentifyClusterIdentifyQueryResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverIdentifyAttributes : public ModelCommand
+class DiscoverIdentifyAttributes: public ModelCommand
 {
 public:
-    DiscoverIdentifyAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverIdentifyAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverIdentifyAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6646,19 +6301,17 @@ class DiscoverIdentifyAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute IdentifyTime
  */
-class ReadIdentifyIdentifyTime : public ModelCommand
+class ReadIdentifyIdentifyTime: public ModelCommand
 {
 public:
-    ReadIdentifyIdentifyTime() : ModelCommand("read")
+    ReadIdentifyIdentifyTime(): ModelCommand("read")
     {
         AddArgument("attr-name", "identify-time");
         ModelCommand::AddArguments();
@@ -6666,8 +6319,8 @@ class ReadIdentifyIdentifyTime : public ModelCommand
 
     ~ReadIdentifyIdentifyTime()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6680,16 +6333,14 @@ class ReadIdentifyIdentifyTime : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class WriteIdentifyIdentifyTime : public ModelCommand
+class WriteIdentifyIdentifyTime: public ModelCommand
 {
 public:
-    WriteIdentifyIdentifyTime() : ModelCommand("write")
+    WriteIdentifyIdentifyTime(): ModelCommand("write")
     {
         AddArgument("attr-name", "identify-time");
         AddArgument("attr-value", 0, UINT16_MAX, &mValue);
@@ -6698,8 +6349,8 @@ class WriteIdentifyIdentifyTime : public ModelCommand
 
     ~WriteIdentifyIdentifyTime()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6712,20 +6363,18 @@ class WriteIdentifyIdentifyTime : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mValue;
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadIdentifyClusterRevision : public ModelCommand
+class ReadIdentifyClusterRevision: public ModelCommand
 {
 public:
-    ReadIdentifyClusterRevision() : ModelCommand("read")
+    ReadIdentifyClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -6733,8 +6382,8 @@ class ReadIdentifyClusterRevision : public ModelCommand
 
     ~ReadIdentifyClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6747,10 +6396,8 @@ class ReadIdentifyClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -6774,10 +6421,10 @@ class ReadIdentifyClusterRevision : public ModelCommand
 /*
  * Command Move
  */
-class LevelControlMove : public ModelCommand
+class LevelControlMove: public ModelCommand
 {
 public:
-    LevelControlMove() : ModelCommand("move")
+    LevelControlMove(): ModelCommand("move")
     {
         AddArgument("moveMode", 0, UINT8_MAX, &mMoveMode);
         AddArgument("rate", 0, UINT8_MAX, &mRate);
@@ -6787,8 +6434,8 @@ class LevelControlMove : public ModelCommand
     }
     ~LevelControlMove()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6797,15 +6444,12 @@ class LevelControlMove : public ModelCommand
 
         chip::Controller::LevelControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.Move(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate, mOptionMask,
-                            mOptionOverride);
+        return cluster.Move(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMoveMode, mRate, mOptionMask, mOptionOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mMoveMode;
     uint8_t mRate;
     uint8_t mOptionMask;
@@ -6815,10 +6459,10 @@ class LevelControlMove : public ModelCommand
 /*
  * Command MoveToLevel
  */
-class LevelControlMoveToLevel : public ModelCommand
+class LevelControlMoveToLevel: public ModelCommand
 {
 public:
-    LevelControlMoveToLevel() : ModelCommand("move-to-level")
+    LevelControlMoveToLevel(): ModelCommand("move-to-level")
     {
         AddArgument("level", 0, UINT8_MAX, &mLevel);
         AddArgument("transitionTime", 0, UINT16_MAX, &mTransitionTime);
@@ -6828,8 +6472,8 @@ class LevelControlMoveToLevel : public ModelCommand
     }
     ~LevelControlMoveToLevel()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6838,15 +6482,12 @@ class LevelControlMoveToLevel : public ModelCommand
 
         chip::Controller::LevelControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.MoveToLevel(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mLevel, mTransitionTime, mOptionMask,
-                                   mOptionOverride);
+        return cluster.MoveToLevel(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mLevel, mTransitionTime, mOptionMask, mOptionOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mLevel;
     uint16_t mTransitionTime;
     uint8_t mOptionMask;
@@ -6856,10 +6497,10 @@ class LevelControlMoveToLevel : public ModelCommand
 /*
  * Command MoveToLevelWithOnOff
  */
-class LevelControlMoveToLevelWithOnOff : public ModelCommand
+class LevelControlMoveToLevelWithOnOff: public ModelCommand
 {
 public:
-    LevelControlMoveToLevelWithOnOff() : ModelCommand("move-to-level-with-on-off")
+    LevelControlMoveToLevelWithOnOff(): ModelCommand("move-to-level-with-on-off")
     {
         AddArgument("level", 0, UINT8_MAX, &mLevel);
         AddArgument("transitionTime", 0, UINT16_MAX, &mTransitionTime);
@@ -6867,8 +6508,8 @@ class LevelControlMoveToLevelWithOnOff : public ModelCommand
     }
     ~LevelControlMoveToLevelWithOnOff()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6881,10 +6522,8 @@ class LevelControlMoveToLevelWithOnOff : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mLevel;
     uint16_t mTransitionTime;
 };
@@ -6892,10 +6531,10 @@ class LevelControlMoveToLevelWithOnOff : public ModelCommand
 /*
  * Command MoveWithOnOff
  */
-class LevelControlMoveWithOnOff : public ModelCommand
+class LevelControlMoveWithOnOff: public ModelCommand
 {
 public:
-    LevelControlMoveWithOnOff() : ModelCommand("move-with-on-off")
+    LevelControlMoveWithOnOff(): ModelCommand("move-with-on-off")
     {
         AddArgument("moveMode", 0, UINT8_MAX, &mMoveMode);
         AddArgument("rate", 0, UINT8_MAX, &mRate);
@@ -6903,8 +6542,8 @@ class LevelControlMoveWithOnOff : public ModelCommand
     }
     ~LevelControlMoveWithOnOff()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6917,10 +6556,8 @@ class LevelControlMoveWithOnOff : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mMoveMode;
     uint8_t mRate;
 };
@@ -6928,10 +6565,10 @@ class LevelControlMoveWithOnOff : public ModelCommand
 /*
  * Command Step
  */
-class LevelControlStep : public ModelCommand
+class LevelControlStep: public ModelCommand
 {
 public:
-    LevelControlStep() : ModelCommand("step")
+    LevelControlStep(): ModelCommand("step")
     {
         AddArgument("stepMode", 0, UINT8_MAX, &mStepMode);
         AddArgument("stepSize", 0, UINT8_MAX, &mStepSize);
@@ -6942,8 +6579,8 @@ class LevelControlStep : public ModelCommand
     }
     ~LevelControlStep()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6952,15 +6589,12 @@ class LevelControlStep : public ModelCommand
 
         chip::Controller::LevelControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.Step(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize, mTransitionTime,
-                            mOptionMask, mOptionOverride);
+        return cluster.Step(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize, mTransitionTime, mOptionMask, mOptionOverride);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mStepMode;
     uint8_t mStepSize;
     uint16_t mTransitionTime;
@@ -6971,10 +6605,10 @@ class LevelControlStep : public ModelCommand
 /*
  * Command StepWithOnOff
  */
-class LevelControlStepWithOnOff : public ModelCommand
+class LevelControlStepWithOnOff: public ModelCommand
 {
 public:
-    LevelControlStepWithOnOff() : ModelCommand("step-with-on-off")
+    LevelControlStepWithOnOff(): ModelCommand("step-with-on-off")
     {
         AddArgument("stepMode", 0, UINT8_MAX, &mStepMode);
         AddArgument("stepSize", 0, UINT8_MAX, &mStepSize);
@@ -6983,8 +6617,8 @@ class LevelControlStepWithOnOff : public ModelCommand
     }
     ~LevelControlStepWithOnOff()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -6993,15 +6627,12 @@ class LevelControlStepWithOnOff : public ModelCommand
 
         chip::Controller::LevelControlCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.StepWithOnOff(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize,
-                                     mTransitionTime);
+        return cluster.StepWithOnOff(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mStepMode, mStepSize, mTransitionTime);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mStepMode;
     uint8_t mStepSize;
     uint16_t mTransitionTime;
@@ -7010,10 +6641,10 @@ class LevelControlStepWithOnOff : public ModelCommand
 /*
  * Command Stop
  */
-class LevelControlStop : public ModelCommand
+class LevelControlStop: public ModelCommand
 {
 public:
-    LevelControlStop() : ModelCommand("stop")
+    LevelControlStop(): ModelCommand("stop")
     {
         AddArgument("optionMask", 0, UINT8_MAX, &mOptionMask);
         AddArgument("optionOverride", 0, UINT8_MAX, &mOptionOverride);
@@ -7021,8 +6652,8 @@ class LevelControlStop : public ModelCommand
     }
     ~LevelControlStop()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7035,10 +6666,8 @@ class LevelControlStop : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint8_t mOptionMask;
     uint8_t mOptionOverride;
 };
@@ -7046,14 +6675,17 @@ class LevelControlStop : public ModelCommand
 /*
  * Command StopWithOnOff
  */
-class LevelControlStopWithOnOff : public ModelCommand
+class LevelControlStopWithOnOff: public ModelCommand
 {
 public:
-    LevelControlStopWithOnOff() : ModelCommand("stop-with-on-off") { ModelCommand::AddArguments(); }
+    LevelControlStopWithOnOff(): ModelCommand("stop-with-on-off")
+    {
+        ModelCommand::AddArguments();
+    }
     ~LevelControlStopWithOnOff()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7066,24 +6698,26 @@ class LevelControlStopWithOnOff : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverLevelControlAttributes : public ModelCommand
+class DiscoverLevelControlAttributes: public ModelCommand
 {
 public:
-    DiscoverLevelControlAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverLevelControlAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverLevelControlAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7096,19 +6730,17 @@ class DiscoverLevelControlAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CurrentLevel
  */
-class ReadLevelControlCurrentLevel : public ModelCommand
+class ReadLevelControlCurrentLevel: public ModelCommand
 {
 public:
-    ReadLevelControlCurrentLevel() : ModelCommand("read")
+    ReadLevelControlCurrentLevel(): ModelCommand("read")
     {
         AddArgument("attr-name", "current-level");
         ModelCommand::AddArguments();
@@ -7116,8 +6748,8 @@ class ReadLevelControlCurrentLevel : public ModelCommand
 
     ~ReadLevelControlCurrentLevel()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7130,16 +6762,14 @@ class ReadLevelControlCurrentLevel : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportLevelControlCurrentLevel : public ModelCommand
+class ReportLevelControlCurrentLevel: public ModelCommand
 {
 public:
-    ReportLevelControlCurrentLevel() : ModelCommand("report")
+    ReportLevelControlCurrentLevel(): ModelCommand("report")
     {
         AddArgument("attr-name", "current-level");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -7150,9 +6780,9 @@ class ReportLevelControlCurrentLevel : public ModelCommand
 
     ~ReportLevelControlCurrentLevel()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7168,17 +6798,13 @@ class ReportLevelControlCurrentLevel : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeCurrentLevel(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                      mMaxInterval, mChange);
+        return cluster.ConfigureAttributeCurrentLevel(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval, mChange);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     uint8_t mChange;
@@ -7187,10 +6813,10 @@ class ReportLevelControlCurrentLevel : public ModelCommand
 /*
  * Attribute ClusterRevision
  */
-class ReadLevelControlClusterRevision : public ModelCommand
+class ReadLevelControlClusterRevision: public ModelCommand
 {
 public:
-    ReadLevelControlClusterRevision() : ModelCommand("read")
+    ReadLevelControlClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -7198,8 +6824,8 @@ class ReadLevelControlClusterRevision : public ModelCommand
 
     ~ReadLevelControlClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7212,10 +6838,8 @@ class ReadLevelControlClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -7231,14 +6855,17 @@ class ReadLevelControlClusterRevision : public ModelCommand
 /*
  * Command Sleep
  */
-class LowPowerSleep : public ModelCommand
+class LowPowerSleep: public ModelCommand
 {
 public:
-    LowPowerSleep() : ModelCommand("sleep") { ModelCommand::AddArguments(); }
+    LowPowerSleep(): ModelCommand("sleep")
+    {
+        ModelCommand::AddArguments();
+    }
     ~LowPowerSleep()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7251,24 +6878,26 @@ class LowPowerSleep : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverLowPowerAttributes : public ModelCommand
+class DiscoverLowPowerAttributes: public ModelCommand
 {
 public:
-    DiscoverLowPowerAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverLowPowerAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverLowPowerAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7281,19 +6910,17 @@ class DiscoverLowPowerAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadLowPowerClusterRevision : public ModelCommand
+class ReadLowPowerClusterRevision: public ModelCommand
 {
 public:
-    ReadLowPowerClusterRevision() : ModelCommand("read")
+    ReadLowPowerClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -7301,8 +6928,8 @@ class ReadLowPowerClusterRevision : public ModelCommand
 
     ~ReadLowPowerClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7315,10 +6942,8 @@ class ReadLowPowerClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -7337,14 +6962,17 @@ class ReadLowPowerClusterRevision : public ModelCommand
 /*
  * Command Off
  */
-class OnOffOff : public ModelCommand
+class OnOffOff: public ModelCommand
 {
 public:
-    OnOffOff() : ModelCommand("off") { ModelCommand::AddArguments(); }
+    OnOffOff(): ModelCommand("off")
+    {
+        ModelCommand::AddArguments();
+    }
     ~OnOffOff()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7357,23 +6985,24 @@ class OnOffOff : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Command On
  */
-class OnOffOn : public ModelCommand
+class OnOffOn: public ModelCommand
 {
 public:
-    OnOffOn() : ModelCommand("on") { ModelCommand::AddArguments(); }
+    OnOffOn(): ModelCommand("on")
+    {
+        ModelCommand::AddArguments();
+    }
     ~OnOffOn()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7386,23 +7015,24 @@ class OnOffOn : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Command Toggle
  */
-class OnOffToggle : public ModelCommand
+class OnOffToggle: public ModelCommand
 {
 public:
-    OnOffToggle() : ModelCommand("toggle") { ModelCommand::AddArguments(); }
+    OnOffToggle(): ModelCommand("toggle")
+    {
+        ModelCommand::AddArguments();
+    }
     ~OnOffToggle()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7415,24 +7045,26 @@ class OnOffToggle : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverOnOffAttributes : public ModelCommand
+class DiscoverOnOffAttributes: public ModelCommand
 {
 public:
-    DiscoverOnOffAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverOnOffAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverOnOffAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7445,19 +7077,17 @@ class DiscoverOnOffAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute OnOff
  */
-class ReadOnOffOnOff : public ModelCommand
+class ReadOnOffOnOff: public ModelCommand
 {
 public:
-    ReadOnOffOnOff() : ModelCommand("read")
+    ReadOnOffOnOff(): ModelCommand("read")
     {
         AddArgument("attr-name", "on-off");
         ModelCommand::AddArguments();
@@ -7465,8 +7095,8 @@ class ReadOnOffOnOff : public ModelCommand
 
     ~ReadOnOffOnOff()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7479,16 +7109,14 @@ class ReadOnOffOnOff : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<BooleanAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<BooleanAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportOnOffOnOff : public ModelCommand
+class ReportOnOffOnOff: public ModelCommand
 {
 public:
-    ReportOnOffOnOff() : ModelCommand("report")
+    ReportOnOffOnOff(): ModelCommand("report")
     {
         AddArgument("attr-name", "on-off");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -7498,9 +7126,9 @@ class ReportOnOffOnOff : public ModelCommand
 
     ~ReportOnOffOnOff()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7516,17 +7144,13 @@ class ReportOnOffOnOff : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeOnOff(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                               mMaxInterval);
+        return cluster.ConfigureAttributeOnOff(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<BooleanAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<BooleanAttributeCallback> * onReportCallback = new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
 };
@@ -7534,10 +7158,10 @@ class ReportOnOffOnOff : public ModelCommand
 /*
  * Attribute ClusterRevision
  */
-class ReadOnOffClusterRevision : public ModelCommand
+class ReadOnOffClusterRevision: public ModelCommand
 {
 public:
-    ReadOnOffClusterRevision() : ModelCommand("read")
+    ReadOnOffClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -7545,8 +7169,8 @@ class ReadOnOffClusterRevision : public ModelCommand
 
     ~ReadOnOffClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7559,10 +7183,8 @@ class ReadOnOffClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -7589,10 +7211,10 @@ class ReadOnOffClusterRevision : public ModelCommand
 /*
  * Command AddScene
  */
-class ScenesAddScene : public ModelCommand
+class ScenesAddScene: public ModelCommand
 {
 public:
-    ScenesAddScene() : ModelCommand("add-scene")
+    ScenesAddScene(): ModelCommand("add-scene")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         AddArgument("sceneId", 0, UINT8_MAX, &mSceneId);
@@ -7605,8 +7227,8 @@ class ScenesAddScene : public ModelCommand
     }
     ~ScenesAddScene()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7615,16 +7237,12 @@ class ScenesAddScene : public ModelCommand
 
         chip::Controller::ScenesCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.AddScene(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mGroupId, mSceneId, mTransitionTime,
-                                chip::ByteSpan(chip::Uint8::from_char(mSceneName), strlen(mSceneName)), mClusterId, mLength,
-                                mValue);
+        return cluster.AddScene(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mGroupId, mSceneId, mTransitionTime,  chip::ByteSpan(chip::Uint8::from_char(mSceneName), strlen(mSceneName)), mClusterId, mLength, mValue);
     }
 
 private:
-    chip::Callback::Callback<ScenesClusterAddSceneResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<ScenesClusterAddSceneResponseCallback>(OnScenesClusterAddSceneResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<ScenesClusterAddSceneResponseCallback> * onSuccessCallback = new chip::Callback::Callback<ScenesClusterAddSceneResponseCallback>(OnScenesClusterAddSceneResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
     uint8_t mSceneId;
     uint16_t mTransitionTime;
@@ -7637,18 +7255,18 @@ class ScenesAddScene : public ModelCommand
 /*
  * Command GetSceneMembership
  */
-class ScenesGetSceneMembership : public ModelCommand
+class ScenesGetSceneMembership: public ModelCommand
 {
 public:
-    ScenesGetSceneMembership() : ModelCommand("get-scene-membership")
+    ScenesGetSceneMembership(): ModelCommand("get-scene-membership")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         ModelCommand::AddArguments();
     }
     ~ScenesGetSceneMembership()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7661,21 +7279,18 @@ class ScenesGetSceneMembership : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(OnScenesClusterGetSceneMembershipResponse,
-                                                                                      this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> * onSuccessCallback = new chip::Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(OnScenesClusterGetSceneMembershipResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
 };
 
 /*
  * Command RecallScene
  */
-class ScenesRecallScene : public ModelCommand
+class ScenesRecallScene: public ModelCommand
 {
 public:
-    ScenesRecallScene() : ModelCommand("recall-scene")
+    ScenesRecallScene(): ModelCommand("recall-scene")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         AddArgument("sceneId", 0, UINT8_MAX, &mSceneId);
@@ -7684,8 +7299,8 @@ class ScenesRecallScene : public ModelCommand
     }
     ~ScenesRecallScene()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7698,10 +7313,8 @@ class ScenesRecallScene : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
     uint8_t mSceneId;
     uint16_t mTransitionTime;
@@ -7710,18 +7323,18 @@ class ScenesRecallScene : public ModelCommand
 /*
  * Command RemoveAllScenes
  */
-class ScenesRemoveAllScenes : public ModelCommand
+class ScenesRemoveAllScenes: public ModelCommand
 {
 public:
-    ScenesRemoveAllScenes() : ModelCommand("remove-all-scenes")
+    ScenesRemoveAllScenes(): ModelCommand("remove-all-scenes")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         ModelCommand::AddArguments();
     }
     ~ScenesRemoveAllScenes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7734,20 +7347,18 @@ class ScenesRemoveAllScenes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(OnScenesClusterRemoveAllScenesResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> * onSuccessCallback = new chip::Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(OnScenesClusterRemoveAllScenesResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
 };
 
 /*
  * Command RemoveScene
  */
-class ScenesRemoveScene : public ModelCommand
+class ScenesRemoveScene: public ModelCommand
 {
 public:
-    ScenesRemoveScene() : ModelCommand("remove-scene")
+    ScenesRemoveScene(): ModelCommand("remove-scene")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         AddArgument("sceneId", 0, UINT8_MAX, &mSceneId);
@@ -7755,8 +7366,8 @@ class ScenesRemoveScene : public ModelCommand
     }
     ~ScenesRemoveScene()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7769,10 +7380,8 @@ class ScenesRemoveScene : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<ScenesClusterRemoveSceneResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(OnScenesClusterRemoveSceneResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<ScenesClusterRemoveSceneResponseCallback> * onSuccessCallback = new chip::Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(OnScenesClusterRemoveSceneResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
     uint8_t mSceneId;
 };
@@ -7780,10 +7389,10 @@ class ScenesRemoveScene : public ModelCommand
 /*
  * Command StoreScene
  */
-class ScenesStoreScene : public ModelCommand
+class ScenesStoreScene: public ModelCommand
 {
 public:
-    ScenesStoreScene() : ModelCommand("store-scene")
+    ScenesStoreScene(): ModelCommand("store-scene")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         AddArgument("sceneId", 0, UINT8_MAX, &mSceneId);
@@ -7791,8 +7400,8 @@ class ScenesStoreScene : public ModelCommand
     }
     ~ScenesStoreScene()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7805,10 +7414,8 @@ class ScenesStoreScene : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<ScenesClusterStoreSceneResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<ScenesClusterStoreSceneResponseCallback>(OnScenesClusterStoreSceneResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<ScenesClusterStoreSceneResponseCallback> * onSuccessCallback = new chip::Callback::Callback<ScenesClusterStoreSceneResponseCallback>(OnScenesClusterStoreSceneResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
     uint8_t mSceneId;
 };
@@ -7816,10 +7423,10 @@ class ScenesStoreScene : public ModelCommand
 /*
  * Command ViewScene
  */
-class ScenesViewScene : public ModelCommand
+class ScenesViewScene: public ModelCommand
 {
 public:
-    ScenesViewScene() : ModelCommand("view-scene")
+    ScenesViewScene(): ModelCommand("view-scene")
     {
         AddArgument("groupId", 0, UINT16_MAX, &mGroupId);
         AddArgument("sceneId", 0, UINT8_MAX, &mSceneId);
@@ -7827,8 +7434,8 @@ class ScenesViewScene : public ModelCommand
     }
     ~ScenesViewScene()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7841,26 +7448,28 @@ class ScenesViewScene : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<ScenesClusterViewSceneResponseCallback> * onSuccessCallback =
-        new chip::Callback::Callback<ScenesClusterViewSceneResponseCallback>(OnScenesClusterViewSceneResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<ScenesClusterViewSceneResponseCallback> * onSuccessCallback = new chip::Callback::Callback<ScenesClusterViewSceneResponseCallback>(OnScenesClusterViewSceneResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
     uint16_t mGroupId;
     uint8_t mSceneId;
 };
 
+
 /*
  * Discover Attributes
  */
-class DiscoverScenesAttributes : public ModelCommand
+class DiscoverScenesAttributes: public ModelCommand
 {
 public:
-    DiscoverScenesAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverScenesAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverScenesAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7873,19 +7482,17 @@ class DiscoverScenesAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute SceneCount
  */
-class ReadScenesSceneCount : public ModelCommand
+class ReadScenesSceneCount: public ModelCommand
 {
 public:
-    ReadScenesSceneCount() : ModelCommand("read")
+    ReadScenesSceneCount(): ModelCommand("read")
     {
         AddArgument("attr-name", "scene-count");
         ModelCommand::AddArguments();
@@ -7893,8 +7500,8 @@ class ReadScenesSceneCount : public ModelCommand
 
     ~ReadScenesSceneCount()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7907,19 +7514,17 @@ class ReadScenesSceneCount : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CurrentScene
  */
-class ReadScenesCurrentScene : public ModelCommand
+class ReadScenesCurrentScene: public ModelCommand
 {
 public:
-    ReadScenesCurrentScene() : ModelCommand("read")
+    ReadScenesCurrentScene(): ModelCommand("read")
     {
         AddArgument("attr-name", "current-scene");
         ModelCommand::AddArguments();
@@ -7927,8 +7532,8 @@ class ReadScenesCurrentScene : public ModelCommand
 
     ~ReadScenesCurrentScene()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7941,19 +7546,17 @@ class ReadScenesCurrentScene : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute CurrentGroup
  */
-class ReadScenesCurrentGroup : public ModelCommand
+class ReadScenesCurrentGroup: public ModelCommand
 {
 public:
-    ReadScenesCurrentGroup() : ModelCommand("read")
+    ReadScenesCurrentGroup(): ModelCommand("read")
     {
         AddArgument("attr-name", "current-group");
         ModelCommand::AddArguments();
@@ -7961,8 +7564,8 @@ class ReadScenesCurrentGroup : public ModelCommand
 
     ~ReadScenesCurrentGroup()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -7975,19 +7578,17 @@ class ReadScenesCurrentGroup : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute SceneValid
  */
-class ReadScenesSceneValid : public ModelCommand
+class ReadScenesSceneValid: public ModelCommand
 {
 public:
-    ReadScenesSceneValid() : ModelCommand("read")
+    ReadScenesSceneValid(): ModelCommand("read")
     {
         AddArgument("attr-name", "scene-valid");
         ModelCommand::AddArguments();
@@ -7995,8 +7596,8 @@ class ReadScenesSceneValid : public ModelCommand
 
     ~ReadScenesSceneValid()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8009,19 +7610,17 @@ class ReadScenesSceneValid : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<BooleanAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<BooleanAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute NameSupport
  */
-class ReadScenesNameSupport : public ModelCommand
+class ReadScenesNameSupport: public ModelCommand
 {
 public:
-    ReadScenesNameSupport() : ModelCommand("read")
+    ReadScenesNameSupport(): ModelCommand("read")
     {
         AddArgument("attr-name", "name-support");
         ModelCommand::AddArguments();
@@ -8029,8 +7628,8 @@ class ReadScenesNameSupport : public ModelCommand
 
     ~ReadScenesNameSupport()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8043,19 +7642,17 @@ class ReadScenesNameSupport : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadScenesClusterRevision : public ModelCommand
+class ReadScenesClusterRevision: public ModelCommand
 {
 public:
-    ReadScenesClusterRevision() : ModelCommand("read")
+    ReadScenesClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -8063,8 +7660,8 @@ class ReadScenesClusterRevision : public ModelCommand
 
     ~ReadScenesClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8077,10 +7674,8 @@ class ReadScenesClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*----------------------------------------------------------------------------*\
@@ -8095,18 +7690,22 @@ class ReadScenesClusterRevision : public ModelCommand
 | * ClusterRevision                                                   | 0xFFFD |
 \*----------------------------------------------------------------------------*/
 
+
 /*
  * Discover Attributes
  */
-class DiscoverTemperatureMeasurementAttributes : public ModelCommand
+class DiscoverTemperatureMeasurementAttributes: public ModelCommand
 {
 public:
-    DiscoverTemperatureMeasurementAttributes() : ModelCommand("discover") { ModelCommand::AddArguments(); }
+    DiscoverTemperatureMeasurementAttributes(): ModelCommand("discover")
+    {
+        ModelCommand::AddArguments();
+    }
 
     ~DiscoverTemperatureMeasurementAttributes()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8119,19 +7718,17 @@ class DiscoverTemperatureMeasurementAttributes : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute MeasuredValue
  */
-class ReadTemperatureMeasurementMeasuredValue : public ModelCommand
+class ReadTemperatureMeasurementMeasuredValue: public ModelCommand
 {
 public:
-    ReadTemperatureMeasurementMeasuredValue() : ModelCommand("read")
+    ReadTemperatureMeasurementMeasuredValue(): ModelCommand("read")
     {
         AddArgument("attr-name", "measured-value");
         ModelCommand::AddArguments();
@@ -8139,8 +7736,8 @@ class ReadTemperatureMeasurementMeasuredValue : public ModelCommand
 
     ~ReadTemperatureMeasurementMeasuredValue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8153,16 +7750,14 @@ class ReadTemperatureMeasurementMeasuredValue : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16sAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16sAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
-class ReportTemperatureMeasurementMeasuredValue : public ModelCommand
+class ReportTemperatureMeasurementMeasuredValue: public ModelCommand
 {
 public:
-    ReportTemperatureMeasurementMeasuredValue() : ModelCommand("report")
+    ReportTemperatureMeasurementMeasuredValue(): ModelCommand("report")
     {
         AddArgument("attr-name", "measured-value");
         AddArgument("min-interval", 0, UINT16_MAX, &mMinInterval);
@@ -8173,9 +7768,9 @@ class ReportTemperatureMeasurementMeasuredValue : public ModelCommand
 
     ~ReportTemperatureMeasurementMeasuredValue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
-        delete onReportCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
+      delete onReportCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8191,17 +7786,13 @@ class ReportTemperatureMeasurementMeasuredValue : public ModelCommand
             return err;
         }
 
-        return cluster.ConfigureAttributeMeasuredValue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval,
-                                                       mMaxInterval, mChange);
+        return cluster.ConfigureAttributeMeasuredValue(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mMinInterval, mMaxInterval, mChange);
     }
 
 private:
-    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
-        new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    chip::Callback::Callback<Int16sAttributeCallback> * onReportCallback =
-        new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
+    chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback = new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16sAttributeCallback> * onReportCallback = new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
     uint16_t mMinInterval;
     uint16_t mMaxInterval;
     int16_t mChange;
@@ -8210,10 +7801,10 @@ class ReportTemperatureMeasurementMeasuredValue : public ModelCommand
 /*
  * Attribute MinMeasuredValue
  */
-class ReadTemperatureMeasurementMinMeasuredValue : public ModelCommand
+class ReadTemperatureMeasurementMinMeasuredValue: public ModelCommand
 {
 public:
-    ReadTemperatureMeasurementMinMeasuredValue() : ModelCommand("read")
+    ReadTemperatureMeasurementMinMeasuredValue(): ModelCommand("read")
     {
         AddArgument("attr-name", "min-measured-value");
         ModelCommand::AddArguments();
@@ -8221,8 +7812,8 @@ class ReadTemperatureMeasurementMinMeasuredValue : public ModelCommand
 
     ~ReadTemperatureMeasurementMinMeasuredValue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8235,19 +7826,17 @@ class ReadTemperatureMeasurementMinMeasuredValue : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16sAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16sAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute MaxMeasuredValue
  */
-class ReadTemperatureMeasurementMaxMeasuredValue : public ModelCommand
+class ReadTemperatureMeasurementMaxMeasuredValue: public ModelCommand
 {
 public:
-    ReadTemperatureMeasurementMaxMeasuredValue() : ModelCommand("read")
+    ReadTemperatureMeasurementMaxMeasuredValue(): ModelCommand("read")
     {
         AddArgument("attr-name", "max-measured-value");
         ModelCommand::AddArguments();
@@ -8255,8 +7844,8 @@ class ReadTemperatureMeasurementMaxMeasuredValue : public ModelCommand
 
     ~ReadTemperatureMeasurementMaxMeasuredValue()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8269,19 +7858,17 @@ class ReadTemperatureMeasurementMaxMeasuredValue : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16sAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16sAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
 /*
  * Attribute ClusterRevision
  */
-class ReadTemperatureMeasurementClusterRevision : public ModelCommand
+class ReadTemperatureMeasurementClusterRevision: public ModelCommand
 {
 public:
-    ReadTemperatureMeasurementClusterRevision() : ModelCommand("read")
+    ReadTemperatureMeasurementClusterRevision(): ModelCommand("read")
     {
         AddArgument("attr-name", "cluster-revision");
         ModelCommand::AddArguments();
@@ -8289,8 +7876,8 @@ class ReadTemperatureMeasurementClusterRevision : public ModelCommand
 
     ~ReadTemperatureMeasurementClusterRevision()
     {
-        delete onSuccessCallback;
-        delete onFailureCallback;
+      delete onSuccessCallback;
+      delete onFailureCallback;
     }
 
     CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override
@@ -8303,12 +7890,11 @@ class ReadTemperatureMeasurementClusterRevision : public ModelCommand
     }
 
 private:
-    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
-        new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onSuccessCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback = new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
 };
 
+
 /*----------------------------------------------------------------------------*\
 | Register all Clusters commands                                               |
 \*----------------------------------------------------------------------------*/
@@ -8317,10 +7903,14 @@ void registerClusterApplicationBasic(Commands & commands)
     const char * clusterName = "ApplicationBasic";
 
     commands_list clusterCommands = {
-        make_unique<DiscoverApplicationBasicAttributes>(),  make_unique<ReadApplicationBasicVendorName>(),
-        make_unique<ReadApplicationBasicVendorId>(),        make_unique<ReadApplicationBasicApplicationName>(),
-        make_unique<ReadApplicationBasicProductId>(),       make_unique<ReadApplicationBasicApplicationId>(),
-        make_unique<ReadApplicationBasicCatalogVendorId>(), make_unique<ReadApplicationBasicApplicationSatus>(),
+        make_unique<DiscoverApplicationBasicAttributes>(),
+        make_unique<ReadApplicationBasicVendorName>(),
+        make_unique<ReadApplicationBasicVendorId>(),
+        make_unique<ReadApplicationBasicApplicationName>(),
+        make_unique<ReadApplicationBasicProductId>(),
+        make_unique<ReadApplicationBasicApplicationId>(),
+        make_unique<ReadApplicationBasicCatalogVendorId>(),
+        make_unique<ReadApplicationBasicApplicationSatus>(),
         make_unique<ReadApplicationBasicClusterRevision>(),
     };
 
@@ -8331,10 +7921,14 @@ void registerClusterBarrierControl(Commands & commands)
     const char * clusterName = "BarrierControl";
 
     commands_list clusterCommands = {
-        make_unique<BarrierControlBarrierControlGoToPercent>(), make_unique<BarrierControlBarrierControlStop>(),
-        make_unique<DiscoverBarrierControlAttributes>(),        make_unique<ReadBarrierControlBarrierMovingState>(),
-        make_unique<ReadBarrierControlBarrierSafetyStatus>(),   make_unique<ReadBarrierControlBarrierCapabilities>(),
-        make_unique<ReadBarrierControlBarrierPosition>(),       make_unique<ReadBarrierControlClusterRevision>(),
+        make_unique<BarrierControlBarrierControlGoToPercent>(),
+        make_unique<BarrierControlBarrierControlStop>(),
+        make_unique<DiscoverBarrierControlAttributes>(),
+        make_unique<ReadBarrierControlBarrierMovingState>(),
+        make_unique<ReadBarrierControlBarrierSafetyStatus>(),
+        make_unique<ReadBarrierControlBarrierCapabilities>(),
+        make_unique<ReadBarrierControlBarrierPosition>(),
+        make_unique<ReadBarrierControlClusterRevision>(),
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -8513,10 +8107,14 @@ void registerClusterGeneralCommissioning(Commands & commands)
     const char * clusterName = "GeneralCommissioning";
 
     commands_list clusterCommands = {
-        make_unique<GeneralCommissioningArmFailSafe>(),     make_unique<GeneralCommissioningCommissioningComplete>(),
-        make_unique<GeneralCommissioningSetFabric>(),       make_unique<DiscoverGeneralCommissioningAttributes>(),
-        make_unique<ReadGeneralCommissioningFabricId>(),    make_unique<ReadGeneralCommissioningBreadcrumb>(),
-        make_unique<WriteGeneralCommissioningBreadcrumb>(), make_unique<ReadGeneralCommissioningClusterRevision>(),
+        make_unique<GeneralCommissioningArmFailSafe>(),
+        make_unique<GeneralCommissioningCommissioningComplete>(),
+        make_unique<GeneralCommissioningSetFabric>(),
+        make_unique<DiscoverGeneralCommissioningAttributes>(),
+        make_unique<ReadGeneralCommissioningFabricId>(),
+        make_unique<ReadGeneralCommissioningBreadcrumb>(),
+        make_unique<WriteGeneralCommissioningBreadcrumb>(),
+        make_unique<ReadGeneralCommissioningClusterRevision>(),
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -8544,9 +8142,12 @@ void registerClusterIdentify(Commands & commands)
     const char * clusterName = "Identify";
 
     commands_list clusterCommands = {
-        make_unique<IdentifyIdentify>(),           make_unique<IdentifyIdentifyQuery>(),
-        make_unique<DiscoverIdentifyAttributes>(), make_unique<ReadIdentifyIdentifyTime>(),
-        make_unique<WriteIdentifyIdentifyTime>(),  make_unique<ReadIdentifyClusterRevision>(),
+        make_unique<IdentifyIdentify>(),
+        make_unique<IdentifyIdentifyQuery>(),
+        make_unique<DiscoverIdentifyAttributes>(),
+        make_unique<ReadIdentifyIdentifyTime>(),
+        make_unique<WriteIdentifyIdentifyTime>(),
+        make_unique<ReadIdentifyClusterRevision>(),
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -8605,11 +8206,20 @@ void registerClusterScenes(Commands & commands)
     const char * clusterName = "Scenes";
 
     commands_list clusterCommands = {
-        make_unique<ScenesAddScene>(),         make_unique<ScenesGetSceneMembership>(),  make_unique<ScenesRecallScene>(),
-        make_unique<ScenesRemoveAllScenes>(),  make_unique<ScenesRemoveScene>(),         make_unique<ScenesStoreScene>(),
-        make_unique<ScenesViewScene>(),        make_unique<DiscoverScenesAttributes>(),  make_unique<ReadScenesSceneCount>(),
-        make_unique<ReadScenesCurrentScene>(), make_unique<ReadScenesCurrentGroup>(),    make_unique<ReadScenesSceneValid>(),
-        make_unique<ReadScenesNameSupport>(),  make_unique<ReadScenesClusterRevision>(),
+        make_unique<ScenesAddScene>(),
+        make_unique<ScenesGetSceneMembership>(),
+        make_unique<ScenesRecallScene>(),
+        make_unique<ScenesRemoveAllScenes>(),
+        make_unique<ScenesRemoveScene>(),
+        make_unique<ScenesStoreScene>(),
+        make_unique<ScenesViewScene>(),
+        make_unique<DiscoverScenesAttributes>(),
+        make_unique<ReadScenesSceneCount>(),
+        make_unique<ReadScenesCurrentScene>(),
+        make_unique<ReadScenesCurrentGroup>(),
+        make_unique<ReadScenesSceneValid>(),
+        make_unique<ReadScenesNameSupport>(),
+        make_unique<ReadScenesClusterRevision>(),
     };
 
     commands.Register(clusterName, clusterCommands);
@@ -8619,9 +8229,12 @@ void registerClusterTemperatureMeasurement(Commands & commands)
     const char * clusterName = "TemperatureMeasurement";
 
     commands_list clusterCommands = {
-        make_unique<DiscoverTemperatureMeasurementAttributes>(),   make_unique<ReadTemperatureMeasurementMeasuredValue>(),
-        make_unique<ReportTemperatureMeasurementMeasuredValue>(),  make_unique<ReadTemperatureMeasurementMinMeasuredValue>(),
-        make_unique<ReadTemperatureMeasurementMaxMeasuredValue>(), make_unique<ReadTemperatureMeasurementClusterRevision>(),
+        make_unique<DiscoverTemperatureMeasurementAttributes>(),
+        make_unique<ReadTemperatureMeasurementMeasuredValue>(),
+        make_unique<ReportTemperatureMeasurementMeasuredValue>(),
+        make_unique<ReadTemperatureMeasurementMinMeasuredValue>(),
+        make_unique<ReadTemperatureMeasurementMaxMeasuredValue>(),
+        make_unique<ReadTemperatureMeasurementClusterRevision>(),
     };
 
     commands.Register(clusterName, clusterCommands);
diff --git a/examples/chip-tool/commands/reporting/Commands.h b/examples/chip-tool/commands/reporting/Commands.h
index d07348ee499386..1e8057a39a857a 100644
--- a/examples/chip-tool/commands/reporting/Commands.h
+++ b/examples/chip-tool/commands/reporting/Commands.h
@@ -21,49 +21,47 @@
 
 #include "ReportingCommand.h"
 
+
 typedef void (*UnsupportedAttributeCallback)(void * context);
 
 class Listen : public ReportingCommand
 {
 public:
-    Listen() : ReportingCommand("listen") {}
+    Listen() : ReportingCommand("listen")
+    {
+    }
 
     ~Listen()
     {
-        delete onReportColorControlCurrentHueCallback;
-        delete onReportColorControlCurrentSaturationCallback;
-        delete onReportColorControlCurrentXCallback;
-        delete onReportColorControlCurrentYCallback;
-        delete onReportColorControlColorTemperatureCallback;
-        delete onReportDoorLockLockStateCallback;
-        delete onReportLevelControlCurrentLevelCallback;
-        delete onReportOnOffOnOffCallback;
-        delete onReportTemperatureMeasurementMeasuredValueCallback;
+    delete onReportColorControlCurrentHueCallback;
+    delete onReportColorControlCurrentSaturationCallback;
+    delete onReportColorControlCurrentXCallback;
+    delete onReportColorControlCurrentYCallback;
+    delete onReportColorControlColorTemperatureCallback;
+    delete onReportDoorLockLockStateCallback;
+    delete onReportLevelControlCurrentLevelCallback;
+    delete onReportOnOffOnOffCallback;
+    delete onReportTemperatureMeasurementMeasuredValueCallback;
     }
-
+    
     void AddReportCallbacks(uint8_t endpointId) override
     {
         chip::app::CHIPDeviceCallbacksMgr & callbacksMgr = chip::app::CHIPDeviceCallbacksMgr::GetInstance();
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0000,
-                                       onReportColorControlCurrentHueCallback->Cancel());
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0001,
-                                       onReportColorControlCurrentSaturationCallback->Cancel());
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0003,
-                                       onReportColorControlCurrentXCallback->Cancel());
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0004,
-                                       onReportColorControlCurrentYCallback->Cancel());
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0007,
-                                       onReportColorControlColorTemperatureCallback->Cancel());
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0101, 0x0000,
-                                       onReportDoorLockLockStateCallback->Cancel());
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0008, 0x0000,
-                                       onReportLevelControlCurrentLevelCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0000, onReportColorControlCurrentHueCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0001, onReportColorControlCurrentSaturationCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0003, onReportColorControlCurrentXCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0004, onReportColorControlCurrentYCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0007, onReportColorControlColorTemperatureCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0101, 0x0000, onReportDoorLockLockStateCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0008, 0x0000, onReportLevelControlCurrentLevelCallback->Cancel());
         callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0006, 0x0000, onReportOnOffOnOffCallback->Cancel());
-        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0402, 0x0000,
-                                       onReportTemperatureMeasurementMeasuredValueCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0402, 0x0000, onReportTemperatureMeasurementMeasuredValueCallback->Cancel());
     }
 
-    static void OnDefaultSuccessResponse(void * context) { ChipLogProgress(chipTool, "Default Success Response"); }
+    static void OnDefaultSuccessResponse(void * context)
+    {
+        ChipLogProgress(chipTool, "Default Success Response");
+    }
 
     static void OnDefaultFailureResponse(void * context, uint8_t status)
     {
@@ -96,24 +94,15 @@ class Listen : public ReportingCommand
     }
 
 private:
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportColorControlCurrentHueCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportColorControlCurrentSaturationCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<Int16uAttributeCallback> * onReportColorControlCurrentXCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<Int16uAttributeCallback> * onReportColorControlCurrentYCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<Int16uAttributeCallback> * onReportColorControlColorTemperatureCallback =
-        new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportDoorLockLockStateCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<Int8uAttributeCallback> * onReportLevelControlCurrentLevelCallback =
-        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
-    chip::Callback::Callback<BooleanAttributeCallback> * onReportOnOffOnOffCallback =
-        new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
-    chip::Callback::Callback<Int16sAttributeCallback> * onReportTemperatureMeasurementMeasuredValueCallback =
-        new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportColorControlCurrentHueCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportColorControlCurrentSaturationCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onReportColorControlCurrentXCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onReportColorControlCurrentYCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<Int16uAttributeCallback> * onReportColorControlColorTemperatureCallback = new chip::Callback::Callback<Int16uAttributeCallback>(OnInt16uAttributeResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportDoorLockLockStateCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportLevelControlCurrentLevelCallback = new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
+    chip::Callback::Callback<BooleanAttributeCallback> * onReportOnOffOnOffCallback = new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
+    chip::Callback::Callback<Int16sAttributeCallback> * onReportTemperatureMeasurementMeasuredValueCallback = new chip::Callback::Callback<Int16sAttributeCallback>(OnInt16sAttributeResponse, this);
 };
 
 void registerCommandsReporting(Commands & commands)
diff --git a/examples/chip-tool/gen/CHIPClientCallbacks.cpp b/examples/chip-tool/gen/CHIPClientCallbacks.cpp
index 2f78e0b4c1b817..e27971329c7c14 100644
--- a/examples/chip-tool/gen/CHIPClientCallbacks.cpp
+++ b/examples/chip-tool/gen/CHIPClientCallbacks.cpp
@@ -20,10 +20,10 @@
 #include "gen/CHIPClientCallbacks.h"
 
 #include "gen/enums.h"
-#include <app/util/CHIPDeviceCallbacksMgr.h>
-#include <app/util/af-enums.h>
 #include <app/util/af.h>
+#include <app/util/af-enums.h>
 #include <app/util/basic-types.h>
+#include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <core/CHIPEncoding.h>
 #include <support/SafeInt.h>
 #include <support/logging/CHIPLogging.h>
@@ -212,14 +212,12 @@ bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, Em
     GET_RESPONSE_CALLBACKS("emberAfDefaultResponseCallback");
     if (status == EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultSuccessCallback> * cb =
-            Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+        Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
         cb->mCall(cb->mContext);
     }
     else
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, static_cast<uint8_t>(status));
     }
 
@@ -252,216 +250,203 @@ bool emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * messag
 
             switch (attributeType)
             {
-            case 0x00: // nodata / No data
-            case 0x0A: // data24 / 24-bit data
-            case 0x0C: // data40 / 40-bit data
-            case 0x0D: // data48 / 48-bit data
-            case 0x0E: // data56 / 56-bit data
-            case 0x1A: // map24 / 24-bit bitmap
-            case 0x1C: // map40 / 40-bit bitmap
-            case 0x1D: // map48 / 48-bit bitmap
-            case 0x1E: // map56 / 56-bit bitmap
-            case 0x22: // uint24 / Unsigned 24-bit integer
-            case 0x24: // uint40 / Unsigned 40-bit integer
-            case 0x25: // uint48 / Unsigned 48-bit integer
-            case 0x26: // uint56 / Unsigned 56-bit integer
-            case 0x2A: // int24 / Signed 24-bit integer
-            case 0x2C: // int40 / Signed 40-bit integer
-            case 0x2D: // int48 / Signed 48-bit integer
-            case 0x2E: // int56 / Signed 56-bit integer
-            case 0x38: // semi / Semi-precision
-            case 0x39: // single / Single precision
-            case 0x3A: // double / Double precision
-            case 0x48: // array / Array
-            case 0x49: // struct / Structure
-            case 0x50: // set / Set
-            case 0x51: // bag / Bag
-            case 0xE0: // ToD / Time of day
-            {
-                ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
-                Callback::Callback<DefaultFailureCallback> * cb =
-                    Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
-                cb->mCall(cb->mContext, EMBER_ZCL_STATUS_INVALID_VALUE);
-                return true;
-            }
-
-            case 0x41: // octstr / Octet string
-            case 0x42: // string / Character string
-            {
-                // Short Strings must contains at least one byte for the length
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t length = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-                // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
-                if (length == 0xFF)
+                case 0x00: // nodata / No data
+                case 0x0A: // data24 / 24-bit data
+                case 0x0C: // data40 / 40-bit data
+                case 0x0D: // data48 / 48-bit data
+                case 0x0E: // data56 / 56-bit data
+                case 0x1A: // map24 / 24-bit bitmap
+                case 0x1C: // map40 / 40-bit bitmap
+                case 0x1D: // map48 / 48-bit bitmap
+                case 0x1E: // map56 / 56-bit bitmap
+                case 0x22: // uint24 / Unsigned 24-bit integer
+                case 0x24: // uint40 / Unsigned 40-bit integer
+                case 0x25: // uint48 / Unsigned 48-bit integer
+                case 0x26: // uint56 / Unsigned 56-bit integer
+                case 0x2A: // int24 / Signed 24-bit integer
+                case 0x2C: // int40 / Signed 40-bit integer
+                case 0x2D: // int48 / Signed 48-bit integer
+                case 0x2E: // int56 / Signed 56-bit integer
+                case 0x38: // semi / Semi-precision
+                case 0x39: // single / Single precision
+                case 0x3A: // double / Double precision
+                case 0x48: // array / Array
+                case 0x49: // struct / Structure
+                case 0x50: // set / Set
+                case 0x51: // bag / Bag
+                case 0xE0: // ToD / Time of day
                 {
-                    length = 0;
+                    ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
+                    Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+                    cb->mCall(cb->mContext, EMBER_ZCL_STATUS_INVALID_VALUE);
+                    return true;
                 }
 
-                CHECK_MESSAGE_LENGTH(length);
-                Callback::Callback<StringAttributeCallback> * cb =
-                    Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-                break;
-            }
-
-            case 0x43: // octstr16 / Long octet string
-            case 0x44: // string16 / Long character string
-            {
-                // Long Strings must contains at least two bytes for the length
-                CHECK_MESSAGE_LENGTH(2);
-                uint16_t length = chip::Encoding::LittleEndian::Read16(message);
-                ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-                // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
-                if (length == 0xFFFF)
+                case 0x41: // octstr / Octet string
+                case 0x42: // string / Character string
                 {
-                    length = 0;
+                    // Short Strings must contains at least one byte for the length
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t length = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  length: 0x%02x", length);
+
+                    // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
+                    if (length == 0xFF)
+                    {
+                        length = 0;
+                    }
+
+                    CHECK_MESSAGE_LENGTH(length);
+                    Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                    break;
                 }
 
-                CHECK_MESSAGE_LENGTH(length);
-                Callback::Callback<StringAttributeCallback> * cb =
-                    Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-                break;
-            }
+                case 0x43: // octstr16 / Long octet string
+                case 0x44: // string16 / Long character string
+                {
+                    // Long Strings must contains at least two bytes for the length
+                    CHECK_MESSAGE_LENGTH(2);
+                    uint16_t length = chip::Encoding::LittleEndian::Read16(message);
+                    ChipLogProgress(Zcl, "  length: 0x%02x", length);
+
+                    // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
+                    if (length == 0xFFFF)
+                    {
+                        length = 0;
+                    }
+
+                    CHECK_MESSAGE_LENGTH(length);
+                    Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                    break;
+                }
 
-            case 0x08: // data8 / 8-bit data
-            case 0x18: // map8 / 8-bit bitmap
-            case 0x20: // uint8 / Unsigned  8-bit integer
-            case 0x30: // enum8 / 8-bit enumeration
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t value = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  value: 0x%02x", value);
+                case 0x08: // data8 / 8-bit data
+                case 0x18: // map8 / 8-bit bitmap
+                case 0x20: // uint8 / Unsigned  8-bit integer
+                case 0x30: // enum8 / 8-bit enumeration
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t value = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  value: 0x%02x", value);
 
-                Callback::Callback<Int8uAttributeCallback> * cb =
-                    Callback::Callback<Int8uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int8uAttributeCallback> * cb = Callback::Callback<Int8uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x09: // data16 / 16-bit data
-            case 0x19: // map16 / 16-bit bitmap
-            case 0x21: // uint16 / Unsigned 16-bit integer
-            case 0x31: // enum16 / 16-bit enumeration
-            case 0xE8: // clusterId / Cluster ID
-            case 0xE9: // attribId / Attribute ID
-            case 0xEA: // bacOID / BACnet OID
-            case 0xF1: // key128 / 128-bit security key
-            case 0xFF: // unk / Unknown
-            {
-                CHECK_MESSAGE_LENGTH(2);
-                uint16_t value = chip::Encoding::LittleEndian::Read16(message);
-                ChipLogProgress(Zcl, "  value: 0x%04x", value);
+                case 0x09: // data16 / 16-bit data
+                case 0x19: // map16 / 16-bit bitmap
+                case 0x21: // uint16 / Unsigned 16-bit integer
+                case 0x31: // enum16 / 16-bit enumeration
+                case 0xE8: // clusterId / Cluster ID
+                case 0xE9: // attribId / Attribute ID
+                case 0xEA: // bacOID / BACnet OID
+                case 0xF1: // key128 / 128-bit security key
+                case 0xFF: // unk / Unknown
+                {
+                    CHECK_MESSAGE_LENGTH(2);
+                    uint16_t value = chip::Encoding::LittleEndian::Read16(message);
+                    ChipLogProgress(Zcl, "  value: 0x%04x", value);
 
-                Callback::Callback<Int16uAttributeCallback> * cb =
-                    Callback::Callback<Int16uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int16uAttributeCallback> * cb = Callback::Callback<Int16uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x0B: // data32 / 32-bit data
-            case 0x1B: // map32 / 32-bit bitmap
-            case 0x23: // uint32 / Unsigned 32-bit integer
-            case 0xE1: // date / Date
-            case 0xE2: // UTC / UTCTime
-            {
-                CHECK_MESSAGE_LENGTH(4);
-                uint32_t value = chip::Encoding::LittleEndian::Read32(message);
-                ChipLogProgress(Zcl, "  value: 0x%08x", value);
+                case 0x0B: // data32 / 32-bit data
+                case 0x1B: // map32 / 32-bit bitmap
+                case 0x23: // uint32 / Unsigned 32-bit integer
+                case 0xE1: // date / Date
+                case 0xE2: // UTC / UTCTime
+                {
+                    CHECK_MESSAGE_LENGTH(4);
+                    uint32_t value = chip::Encoding::LittleEndian::Read32(message);
+                    ChipLogProgress(Zcl, "  value: 0x%08x", value);
 
-                Callback::Callback<Int32uAttributeCallback> * cb =
-                    Callback::Callback<Int32uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int32uAttributeCallback> * cb = Callback::Callback<Int32uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x0F: // data64 / 64-bit data
-            case 0x1F: // map64 / 64-bit bitmap
-            case 0x27: // uint64 / Unsigned 64-bit integer
-            case 0xF0: // EUI64 / IEEE address
-            {
-                CHECK_MESSAGE_LENGTH(8);
-                uint64_t value = chip::Encoding::LittleEndian::Read64(message);
-                ChipLogProgress(Zcl, "  value: 0x%16x", value);
+                case 0x0F: // data64 / 64-bit data
+                case 0x1F: // map64 / 64-bit bitmap
+                case 0x27: // uint64 / Unsigned 64-bit integer
+                case 0xF0: // EUI64 / IEEE address
+                {
+                    CHECK_MESSAGE_LENGTH(8);
+                    uint64_t value = chip::Encoding::LittleEndian::Read64(message);
+                    ChipLogProgress(Zcl, "  value: 0x%16x", value);
 
-                Callback::Callback<Int64uAttributeCallback> * cb =
-                    Callback::Callback<Int64uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int64uAttributeCallback> * cb = Callback::Callback<Int64uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x10: // bool / Boolean
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t value = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  value: %d", value);
+                case 0x10: // bool / Boolean
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t value = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  value: %d", value);
 
-                Callback::Callback<BooleanAttributeCallback> * cb =
-                    Callback::Callback<BooleanAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<BooleanAttributeCallback> * cb = Callback::Callback<BooleanAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x28: // int8 / Signed 8-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
-                ChipLogProgress(Zcl, "  value: %" PRId8, value);
+                case 0x28: // int8 / Signed 8-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId8, value);
 
-                Callback::Callback<Int8sAttributeCallback> * cb =
-                    Callback::Callback<Int8sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int8sAttributeCallback> * cb = Callback::Callback<Int8sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x29: // int16 / Signed 16-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(2);
-                int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
-                ChipLogProgress(Zcl, "  value: %" PRId16, value);
+                case 0x29: // int16 / Signed 16-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(2);
+                    int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId16, value);
 
-                Callback::Callback<Int16sAttributeCallback> * cb =
-                    Callback::Callback<Int16sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int16sAttributeCallback> * cb = Callback::Callback<Int16sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x2B: // int32 / Signed 32-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(4);
-                int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
-                ChipLogProgress(Zcl, "  value: %" PRId32, value);
+                case 0x2B: // int32 / Signed 32-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(4);
+                    int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId32, value);
 
-                Callback::Callback<Int32sAttributeCallback> * cb =
-                    Callback::Callback<Int32sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int32sAttributeCallback> * cb = Callback::Callback<Int32sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x2F: // int64 / Signed 64-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(8);
-                int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
-                ChipLogProgress(Zcl, "  value: %" PRId64, value);
+                case 0x2F: // int64 / Signed 64-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(8);
+                    int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId64, value);
 
-                Callback::Callback<Int64sAttributeCallback> * cb =
-                    Callback::Callback<Int64sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int64sAttributeCallback> * cb = Callback::Callback<Int64sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
             }
         }
         else
         {
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
-        // The current code is written matching the current API where there is a single attribute read
+        // The current code is written matching the current API where there is a single attribute read 
         // per read command. So if multiple attributes are read at the same time, something is wrong
         // somewhere.
         if (messageLen)
@@ -490,8 +475,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa
 
         if (status == EMBER_ZCL_STATUS_SUCCESS)
         {
-            Callback::Callback<DefaultSuccessCallback> * cb =
-                Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext);
         }
         else
@@ -500,8 +484,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa
             uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId
             ChipLogProgress(Zcl, "  attributeId: 0x%04x", attributeId);
 
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
@@ -534,8 +517,7 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me
 
         if (status == EMBER_ZCL_STATUS_SUCCESS)
         {
-            Callback::Callback<DefaultSuccessCallback> * cb =
-                Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext);
         }
         else
@@ -548,12 +530,11 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me
             uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId
             ChipLogProgress(Zcl, "  attributeId: 0x%04x", attributeId);
 
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
-        // The current code is written matching the current API where there is a single attribute report
+        // The current code is written matching the current API where there is a single attribute report 
         // per configure command. So if multiple attributes are configured at the same time, something is wrong
         // somewhere.
         if (messageLen)
@@ -600,8 +581,7 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
 
             // FIXME: unk is not supported yet.
 
-            Callback::Callback<ReadReportingConfigurationReportedCallback> * cb =
-                Callback::Callback<ReadReportingConfigurationReportedCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<ReadReportingConfigurationReportedCallback> * cb = Callback::Callback<ReadReportingConfigurationReportedCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext, minimumReportingInterval, maximumReportingInterval);
         }
         else
@@ -610,8 +590,7 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
             uint16_t timeout = chip::Encoding::LittleEndian::Read16(message); // uint16
             ChipLogProgress(Zcl, "  timeout: %" PRIu16, timeout);
 
-            Callback::Callback<ReadReportingConfigurationReceivedCallback> * cb =
-                Callback::Callback<ReadReportingConfigurationReceivedCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<ReadReportingConfigurationReceivedCallback> * cb = Callback::Callback<ReadReportingConfigurationReceivedCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext, timeout);
         }
     }
@@ -695,14 +674,12 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> * cb = Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -716,14 +693,12 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> * cb = Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -737,14 +712,12 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -758,14 +731,12 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearPinResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearPinResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearPinResponseCallback> * cb = Callback::Callback<DoorLockClusterClearPinResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -779,14 +750,12 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearRfidResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearRfidResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearRfidResponseCallback> * cb = Callback::Callback<DoorLockClusterClearRfidResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -800,14 +769,12 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -821,20 +788,17 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
 
-bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime,
-                                                              uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
 {
     ChipLogProgress(Zcl, "GetHolidayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -847,20 +811,17 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     return true;
 }
 
-bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-                                                        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
+bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
 {
     ChipLogProgress(Zcl, "GetLogRecordResponse:");
     ChipLogProgress(Zcl, "  logEntryId: %" PRIu16 "", logEntryId);
@@ -873,8 +834,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetLogRecordResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> * cb = Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin);
     return true;
 }
@@ -889,8 +850,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetPinResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetPinResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetPinResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetPinResponseCallback> * cb = Callback::Callback<DoorLockClusterGetPinResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, userId, userStatus, userType, pin);
     return true;
 }
@@ -905,8 +866,8 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetRfidResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetRfidResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetRfidResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetRfidResponseCallback> * cb = Callback::Callback<DoorLockClusterGetRfidResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, userId, userStatus, userType, rfid);
     return true;
 }
@@ -919,15 +880,13 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetUserTypeResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> * cb = Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, userId, userType);
     return true;
 }
 
-bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask,
-                                                              uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-                                                              uint8_t endMinute)
+bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     ChipLogProgress(Zcl, "GetWeekdayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -943,20 +902,17 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     return true;
 }
 
-bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status,
-                                                              uint32_t localStartTime, uint32_t localEndTime)
+bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime)
 {
     ChipLogProgress(Zcl, "GetYeardayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -969,14 +925,12 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, scheduleId, userId, localStartTime, localEndTime);
     return true;
 }
@@ -990,14 +944,12 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterLockDoorResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterLockDoorResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterLockDoorResponseCallback> * cb = Callback::Callback<DoorLockClusterLockDoorResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1011,14 +963,12 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1032,14 +982,12 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetPinResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetPinResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetPinResponseCallback> * cb = Callback::Callback<DoorLockClusterSetPinResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1053,14 +1001,12 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetRfidResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetRfidResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetRfidResponseCallback> * cb = Callback::Callback<DoorLockClusterSetRfidResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1074,14 +1020,12 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> * cb = Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1095,14 +1039,12 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1116,14 +1058,12 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1137,14 +1077,12 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * cb = Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1158,14 +1096,12 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> * cb = Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1178,8 +1114,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error
 
     GET_RESPONSE_CALLBACKS("GeneralCommissioningClusterArmFailSafeResponseCallback");
 
-    Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> * cb =
-        Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> * cb = Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, errorCode, debugText);
     return true;
 }
@@ -1192,8 +1128,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin
 
     GET_RESPONSE_CALLBACKS("GeneralCommissioningClusterCommissioningCompleteResponseCallback");
 
-    Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> * cb =
-        Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> * cb = Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, errorCode, debugText);
     return true;
 }
@@ -1206,8 +1142,8 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo
 
     GET_RESPONSE_CALLBACKS("GeneralCommissioningClusterSetFabricResponseCallback");
 
-    Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> * cb =
-        Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> * cb = Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, errorCode, debugText);
     return true;
 }
@@ -1222,20 +1158,17 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<GroupsClusterAddGroupResponseCallback> * cb =
-        Callback::Callback<GroupsClusterAddGroupResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<GroupsClusterAddGroupResponseCallback> * cb = Callback::Callback<GroupsClusterAddGroupResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId);
     return true;
 }
 
-bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
+bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList)
 {
     ChipLogProgress(Zcl, "GetGroupMembershipResponse:");
     ChipLogProgress(Zcl, "  capacity: %" PRIu8 "", capacity);
@@ -1244,8 +1177,8 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui
 
     GET_RESPONSE_CALLBACKS("GroupsClusterGetGroupMembershipResponseCallback");
 
-    Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> * cb =
-        Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> * cb = Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, capacity, groupCount, groupList);
     return true;
 }
@@ -1260,14 +1193,12 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<GroupsClusterRemoveGroupResponseCallback> * cb =
-        Callback::Callback<GroupsClusterRemoveGroupResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<GroupsClusterRemoveGroupResponseCallback> * cb = Callback::Callback<GroupsClusterRemoveGroupResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId);
     return true;
 }
@@ -1283,14 +1214,12 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<GroupsClusterViewGroupResponseCallback> * cb =
-        Callback::Callback<GroupsClusterViewGroupResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<GroupsClusterViewGroupResponseCallback> * cb = Callback::Callback<GroupsClusterViewGroupResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, groupName);
     return true;
 }
@@ -1302,8 +1231,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout)
 
     GET_RESPONSE_CALLBACKS("IdentifyClusterIdentifyQueryResponseCallback");
 
-    Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> * cb =
-        Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> * cb = Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, timeout);
     return true;
 }
@@ -1319,20 +1248,17 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterAddSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterAddSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterAddSceneResponseCallback> * cb = Callback::Callback<ScenesClusterAddSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId);
     return true;
 }
 
-bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
+bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList)
 {
     ChipLogProgress(Zcl, "GetSceneMembershipResponse:");
     LogStatus(status);
@@ -1345,14 +1271,12 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> * cb =
-        Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> * cb = Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, capacity, groupId, sceneCount, sceneList);
     return true;
 }
@@ -1367,14 +1291,12 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> * cb =
-        Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> * cb = Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId);
     return true;
 }
@@ -1390,14 +1312,12 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterRemoveSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterRemoveSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterRemoveSceneResponseCallback> * cb = Callback::Callback<ScenesClusterRemoveSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId);
     return true;
 }
@@ -1413,21 +1333,17 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterStoreSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterStoreSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterStoreSceneResponseCallback> * cb = Callback::Callback<ScenesClusterStoreSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId);
     return true;
 }
 
-bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                                   uint8_t * sceneName,
-                                                   /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
+bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
 {
     ChipLogProgress(Zcl, "ViewSceneResponse:");
     LogStatus(status);
@@ -1441,18 +1357,17 @@ bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t grou
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterViewSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterViewSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterViewSceneResponseCallback> * cb = Callback::Callback<ScenesClusterViewSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
     return true;
 }
 
+
 bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen)
 {
     ChipLogProgress(Zcl, "emberAfReportAttributeCallback:");
@@ -1481,203 +1396,192 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin
 
         switch (attributeType)
         {
-        case 0x00: // nodata / No data
-        case 0x0A: // data24 / 24-bit data
-        case 0x0C: // data40 / 40-bit data
-        case 0x0D: // data48 / 48-bit data
-        case 0x0E: // data56 / 56-bit data
-        case 0x1A: // map24 / 24-bit bitmap
-        case 0x1C: // map40 / 40-bit bitmap
-        case 0x1D: // map48 / 48-bit bitmap
-        case 0x1E: // map56 / 56-bit bitmap
-        case 0x22: // uint24 / Unsigned 24-bit integer
-        case 0x24: // uint40 / Unsigned 40-bit integer
-        case 0x25: // uint48 / Unsigned 48-bit integer
-        case 0x26: // uint56 / Unsigned 56-bit integer
-        case 0x2A: // int24 / Signed 24-bit integer
-        case 0x2C: // int40 / Signed 40-bit integer
-        case 0x2D: // int48 / Signed 48-bit integer
-        case 0x2E: // int56 / Signed 56-bit integer
-        case 0x38: // semi / Semi-precision
-        case 0x39: // single / Single precision
-        case 0x3A: // double / Double precision
-        case 0x48: // array / Array
-        case 0x49: // struct / Structure
-        case 0x50: // set / Set
-        case 0x51: // bag / Bag
-        case 0xE0: // ToD / Time of day
-        {
-            ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
-            return true;
-        }
-
-        case 0x41: // octstr / Octet string
-        case 0x42: // string / Character string
-        {
-            // Short Strings must contains at least one byte for the length
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t length = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-            // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
-            if (length == 0xFF)
+            case 0x00: // nodata / No data
+            case 0x0A: // data24 / 24-bit data
+            case 0x0C: // data40 / 40-bit data
+            case 0x0D: // data48 / 48-bit data
+            case 0x0E: // data56 / 56-bit data
+            case 0x1A: // map24 / 24-bit bitmap
+            case 0x1C: // map40 / 40-bit bitmap
+            case 0x1D: // map48 / 48-bit bitmap
+            case 0x1E: // map56 / 56-bit bitmap
+            case 0x22: // uint24 / Unsigned 24-bit integer
+            case 0x24: // uint40 / Unsigned 40-bit integer
+            case 0x25: // uint48 / Unsigned 48-bit integer
+            case 0x26: // uint56 / Unsigned 56-bit integer
+            case 0x2A: // int24 / Signed 24-bit integer
+            case 0x2C: // int40 / Signed 40-bit integer
+            case 0x2D: // int48 / Signed 48-bit integer
+            case 0x2E: // int56 / Signed 56-bit integer
+            case 0x38: // semi / Semi-precision
+            case 0x39: // single / Single precision
+            case 0x3A: // double / Double precision
+            case 0x48: // array / Array
+            case 0x49: // struct / Structure
+            case 0x50: // set / Set
+            case 0x51: // bag / Bag
+            case 0xE0: // ToD / Time of day
             {
-                length = 0;
+                ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
+                return true;
             }
 
-            CHECK_MESSAGE_LENGTH(length);
-            Callback::Callback<StringAttributeCallback> * cb =
-                Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-            break;
-        }
+            case 0x41: // octstr / Octet string
+            case 0x42: // string / Character string
+            {
+                // Short Strings must contains at least one byte for the length
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t length = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  length: 0x%02x", length);
 
-        case 0x43: // octstr16 / Long octet string
-        case 0x44: // string16 / Long character string
-        {
-            // Long Strings must contains at least two bytes for the length
-            CHECK_MESSAGE_LENGTH(2);
-            uint16_t length = chip::Encoding::LittleEndian::Read16(message);
-            ChipLogProgress(Zcl, "  length: 0x%02x", length);
+                // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
+                if (length == 0xFF)
+                {
+                    length = 0;
+                }
 
-            // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
-            if (length == 0xFFFF)
-            {
-                length = 0;
+                CHECK_MESSAGE_LENGTH(length);
+                Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                break;
             }
 
-            CHECK_MESSAGE_LENGTH(length);
-            Callback::Callback<StringAttributeCallback> * cb =
-                Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-            break;
-        }
+            case 0x43: // octstr16 / Long octet string
+            case 0x44: // string16 / Long character string
+            {
+                // Long Strings must contains at least two bytes for the length
+                CHECK_MESSAGE_LENGTH(2);
+                uint16_t length = chip::Encoding::LittleEndian::Read16(message);
+                ChipLogProgress(Zcl, "  length: 0x%02x", length);
 
-        case 0x08: // data8 / 8-bit data
-        case 0x18: // map8 / 8-bit bitmap
-        case 0x20: // uint8 / Unsigned  8-bit integer
-        case 0x30: // enum8 / 8-bit enumeration
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t value = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  value: 0x%02x", value);
+                // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
+                if (length == 0xFFFF)
+                {
+                    length = 0;
+                }
 
-            Callback::Callback<Int8uAttributeCallback> * cb =
-                Callback::Callback<Int8uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                CHECK_MESSAGE_LENGTH(length);
+                Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                break;
+            }
 
-        case 0x09: // data16 / 16-bit data
-        case 0x19: // map16 / 16-bit bitmap
-        case 0x21: // uint16 / Unsigned 16-bit integer
-        case 0x31: // enum16 / 16-bit enumeration
-        case 0xE8: // clusterId / Cluster ID
-        case 0xE9: // attribId / Attribute ID
-        case 0xEA: // bacOID / BACnet OID
-        case 0xF1: // key128 / 128-bit security key
-        case 0xFF: // unk / Unknown
-        {
-            CHECK_MESSAGE_LENGTH(2);
-            uint16_t value = chip::Encoding::LittleEndian::Read16(message);
-            ChipLogProgress(Zcl, "  value: 0x%04x", value);
+            case 0x08: // data8 / 8-bit data
+            case 0x18: // map8 / 8-bit bitmap
+            case 0x20: // uint8 / Unsigned  8-bit integer
+            case 0x30: // enum8 / 8-bit enumeration
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t value = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  value: 0x%02x", value);
 
-            Callback::Callback<Int16uAttributeCallback> * cb =
-                Callback::Callback<Int16uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int8uAttributeCallback> * cb = Callback::Callback<Int8uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x0B: // data32 / 32-bit data
-        case 0x1B: // map32 / 32-bit bitmap
-        case 0x23: // uint32 / Unsigned 32-bit integer
-        case 0xE1: // date / Date
-        case 0xE2: // UTC / UTCTime
-        {
-            CHECK_MESSAGE_LENGTH(4);
-            uint32_t value = chip::Encoding::LittleEndian::Read32(message);
-            ChipLogProgress(Zcl, "  value: 0x%08x", value);
+            case 0x09: // data16 / 16-bit data
+            case 0x19: // map16 / 16-bit bitmap
+            case 0x21: // uint16 / Unsigned 16-bit integer
+            case 0x31: // enum16 / 16-bit enumeration
+            case 0xE8: // clusterId / Cluster ID
+            case 0xE9: // attribId / Attribute ID
+            case 0xEA: // bacOID / BACnet OID
+            case 0xF1: // key128 / 128-bit security key
+            case 0xFF: // unk / Unknown
+            {
+                CHECK_MESSAGE_LENGTH(2);
+                uint16_t value = chip::Encoding::LittleEndian::Read16(message);
+                ChipLogProgress(Zcl, "  value: 0x%04x", value);
 
-            Callback::Callback<Int32uAttributeCallback> * cb =
-                Callback::Callback<Int32uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int16uAttributeCallback> * cb = Callback::Callback<Int16uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x0F: // data64 / 64-bit data
-        case 0x1F: // map64 / 64-bit bitmap
-        case 0x27: // uint64 / Unsigned 64-bit integer
-        case 0xF0: // EUI64 / IEEE address
-        {
-            CHECK_MESSAGE_LENGTH(8);
-            uint64_t value = chip::Encoding::LittleEndian::Read64(message);
-            ChipLogProgress(Zcl, "  value: 0x%16x", value);
+            case 0x0B: // data32 / 32-bit data
+            case 0x1B: // map32 / 32-bit bitmap
+            case 0x23: // uint32 / Unsigned 32-bit integer
+            case 0xE1: // date / Date
+            case 0xE2: // UTC / UTCTime
+            {
+                CHECK_MESSAGE_LENGTH(4);
+                uint32_t value = chip::Encoding::LittleEndian::Read32(message);
+                ChipLogProgress(Zcl, "  value: 0x%08x", value);
 
-            Callback::Callback<Int64uAttributeCallback> * cb =
-                Callback::Callback<Int64uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int32uAttributeCallback> * cb = Callback::Callback<Int32uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x10: // bool / Boolean
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t value = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  value: %d", value);
+            case 0x0F: // data64 / 64-bit data
+            case 0x1F: // map64 / 64-bit bitmap
+            case 0x27: // uint64 / Unsigned 64-bit integer
+            case 0xF0: // EUI64 / IEEE address
+            {
+                CHECK_MESSAGE_LENGTH(8);
+                uint64_t value = chip::Encoding::LittleEndian::Read64(message);
+                ChipLogProgress(Zcl, "  value: 0x%16x", value);
 
-            Callback::Callback<BooleanAttributeCallback> * cb =
-                Callback::Callback<BooleanAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int64uAttributeCallback> * cb = Callback::Callback<Int64uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x28: // int8 / Signed 8-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
-            ChipLogProgress(Zcl, "  value: %" PRId8, value);
+            case 0x10: // bool / Boolean
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t value = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  value: %d", value);
 
-            Callback::Callback<Int8sAttributeCallback> * cb =
-                Callback::Callback<Int8sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<BooleanAttributeCallback> * cb = Callback::Callback<BooleanAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x29: // int16 / Signed 16-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(2);
-            int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
-            ChipLogProgress(Zcl, "  value: %" PRId16, value);
+            case 0x28: // int8 / Signed 8-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
+                ChipLogProgress(Zcl, "  value: %" PRId8, value);
 
-            Callback::Callback<Int16sAttributeCallback> * cb =
-                Callback::Callback<Int16sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int8sAttributeCallback> * cb = Callback::Callback<Int8sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x2B: // int32 / Signed 32-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(4);
-            int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
-            ChipLogProgress(Zcl, "  value: %" PRId32, value);
+            case 0x29: // int16 / Signed 16-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(2);
+                int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
+                ChipLogProgress(Zcl, "  value: %" PRId16, value);
 
-            Callback::Callback<Int32sAttributeCallback> * cb =
-                Callback::Callback<Int32sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int16sAttributeCallback> * cb = Callback::Callback<Int16sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x2F: // int64 / Signed 64-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(8);
-            int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
-            ChipLogProgress(Zcl, "  value: %" PRId64, value);
+            case 0x2B: // int32 / Signed 32-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(4);
+                int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
+                ChipLogProgress(Zcl, "  value: %" PRId32, value);
 
-            Callback::Callback<Int64sAttributeCallback> * cb =
-                Callback::Callback<Int64sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int32sAttributeCallback> * cb = Callback::Callback<Int32sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
+
+            case 0x2F: // int64 / Signed 64-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(8);
+                int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
+                ChipLogProgress(Zcl, "  value: %" PRId64, value);
+
+                Callback::Callback<Int64sAttributeCallback> * cb = Callback::Callback<Int64sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
         }
     }
 
diff --git a/examples/chip-tool/gen/CHIPClientCallbacks.h b/examples/chip-tool/gen/CHIPClientCallbacks.h
index a6adcbc4a710b6..7e0d3882f082c2 100644
--- a/examples/chip-tool/gen/CHIPClientCallbacks.h
+++ b/examples/chip-tool/gen/CHIPClientCallbacks.h
@@ -35,8 +35,8 @@ typedef void (*Int32sAttributeCallback)(void * context, int32_t value);
 typedef void (*Int64uAttributeCallback)(void * context, uint64_t value);
 typedef void (*Int64sAttributeCallback)(void * context, int64_t value);
 typedef void (*StringAttributeCallback)(void * context, const chip::ByteSpan value);
-typedef void (*ReadReportingConfigurationReportedCallback)(void * context, uint16_t minInterval, uint16_t maxInterval);
-typedef void (*ReadReportingConfigurationReceivedCallback)(void * context, uint16_t timeout);
+typedef void (*ReadReportingConfigurationReportedCallback)(void* context, uint16_t minInterval, uint16_t maxInterval);
+typedef void (*ReadReportingConfigurationReceivedCallback)(void* context, uint16_t timeout);
 
 // Cluster Specific Response Callbacks
 typedef void (*DoorLockClusterClearAllPinsResponseCallback)(void * context);
@@ -46,21 +46,13 @@ typedef void (*DoorLockClusterClearPinResponseCallback)(void * context);
 typedef void (*DoorLockClusterClearRfidResponseCallback)(void * context);
 typedef void (*DoorLockClusterClearWeekdayScheduleResponseCallback)(void * context);
 typedef void (*DoorLockClusterClearYeardayScheduleResponseCallback)(void * context);
-typedef void (*DoorLockClusterGetHolidayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint32_t localStartTime,
-                                                                  uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
-typedef void (*DoorLockClusterGetLogRecordResponseCallback)(void * context, uint16_t logEntryId, uint32_t timestamp,
-                                                            uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode,
-                                                            uint16_t userId, uint8_t * pin);
-typedef void (*DoorLockClusterGetPinResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                      uint8_t * pin);
-typedef void (*DoorLockClusterGetRfidResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                       uint8_t * rfid);
+typedef void (*DoorLockClusterGetHolidayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
+typedef void (*DoorLockClusterGetLogRecordResponseCallback)(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin);
+typedef void (*DoorLockClusterGetPinResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin);
+typedef void (*DoorLockClusterGetRfidResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid);
 typedef void (*DoorLockClusterGetUserTypeResponseCallback)(void * context, uint16_t userId, uint8_t userType);
-typedef void (*DoorLockClusterGetWeekdayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId,
-                                                                  uint8_t daysMask, uint8_t startHour, uint8_t startMinute,
-                                                                  uint8_t endHour, uint8_t endMinute);
-typedef void (*DoorLockClusterGetYeardayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId,
-                                                                  uint32_t localStartTime, uint32_t localEndTime);
+typedef void (*DoorLockClusterGetWeekdayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+typedef void (*DoorLockClusterGetYeardayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime);
 typedef void (*DoorLockClusterLockDoorResponseCallback)(void * context);
 typedef void (*DoorLockClusterSetHolidayScheduleResponseCallback)(void * context);
 typedef void (*DoorLockClusterSetPinResponseCallback)(void * context);
@@ -71,22 +63,16 @@ typedef void (*DoorLockClusterSetYeardayScheduleResponseCallback)(void * context
 typedef void (*DoorLockClusterUnlockDoorResponseCallback)(void * context);
 typedef void (*DoorLockClusterUnlockWithTimeoutResponseCallback)(void * context);
 typedef void (*GeneralCommissioningClusterArmFailSafeResponseCallback)(void * context, uint8_t errorCode, uint8_t * debugText);
-typedef void (*GeneralCommissioningClusterCommissioningCompleteResponseCallback)(void * context, uint8_t errorCode,
-                                                                                 uint8_t * debugText);
+typedef void (*GeneralCommissioningClusterCommissioningCompleteResponseCallback)(void * context, uint8_t errorCode, uint8_t * debugText);
 typedef void (*GeneralCommissioningClusterSetFabricResponseCallback)(void * context, uint8_t errorCode, uint8_t * debugText);
 typedef void (*GroupsClusterAddGroupResponseCallback)(void * context, uint16_t groupId);
-typedef void (*GroupsClusterGetGroupMembershipResponseCallback)(void * context, uint8_t capacity, uint8_t groupCount,
-                                                                /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
+typedef void (*GroupsClusterGetGroupMembershipResponseCallback)(void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList);
 typedef void (*GroupsClusterRemoveGroupResponseCallback)(void * context, uint16_t groupId);
 typedef void (*GroupsClusterViewGroupResponseCallback)(void * context, uint16_t groupId, uint8_t * groupName);
 typedef void (*IdentifyClusterIdentifyQueryResponseCallback)(void * context, uint16_t timeout);
 typedef void (*ScenesClusterAddSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId);
-typedef void (*ScenesClusterGetSceneMembershipResponseCallback)(void * context, uint8_t capacity, uint16_t groupId,
-                                                                uint8_t sceneCount,
-                                                                /* TYPE WARNING: array array defaults to */ uint8_t * sceneList);
+typedef void (*ScenesClusterGetSceneMembershipResponseCallback)(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList);
 typedef void (*ScenesClusterRemoveAllScenesResponseCallback)(void * context, uint16_t groupId);
 typedef void (*ScenesClusterRemoveSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId);
 typedef void (*ScenesClusterStoreSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId);
-typedef void (*ScenesClusterViewSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                                       uint8_t * sceneName,
-                                                       /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
+typedef void (*ScenesClusterViewSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets);
diff --git a/examples/chip-tool/gen/CHIPClustersObjc.h b/examples/chip-tool/gen/CHIPClustersObjc.h
index 93e5db92ed0c08..b25bdb215253d9 100644
--- a/examples/chip-tool/gen/CHIPClustersObjc.h
+++ b/examples/chip-tool/gen/CHIPClustersObjc.h
@@ -34,20 +34,21 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface CHIPCluster : NSObject
 
-- (nullable instancetype)initWithDevice:(CHIPDevice *)device
-                               endpoint:(uint8_t)endpoint
-                                  queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint8_t)endpoint queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
 @end
 
+
+
 /**
  * Cluster Application Basic
- *
+ *    
  */
 @interface CHIPApplicationBasic : CHIPCluster
 
+
 - (void)readAttributeVendorName:(ResponseHandler)completionHandler;
 - (void)readAttributeVendorId:(ResponseHandler)completionHandler;
 - (void)readAttributeApplicationName:(ResponseHandler)completionHandler;
@@ -59,9 +60,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Barrier Control
- *
+ *    
  */
 @interface CHIPBarrierControl : CHIPCluster
 
@@ -76,9 +79,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Basic
- *
+ *    
  */
 @interface CHIPBasic : CHIPCluster
 
@@ -101,146 +106,62 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Binding
- *
+ *    
  */
 @interface CHIPBinding : CHIPCluster
 
-- (void)bind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)unbind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)bind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler;
+- (void)unbind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster Color Control
- *
+ *    
  */
 @interface CHIPColorControl : CHIPCluster
 
-- (void)moveColor:(int16_t)rateX
-                rateY:(int16_t)rateY
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveColorTemperature:(uint8_t)moveMode
-                        rate:(uint16_t)rate
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler;
-- (void)moveHue:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveSaturation:(uint8_t)moveMode
-                  rate:(uint8_t)rate
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToColor:(uint16_t)colorX
-               colorY:(uint16_t)colorY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToColorTemperature:(uint16_t)colorTemperature
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToHue:(uint8_t)hue
-            direction:(uint8_t)direction
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToHueAndSaturation:(uint8_t)hue
-                    saturation:(uint8_t)saturation
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToSaturation:(uint8_t)saturation
-          transitionTime:(uint16_t)transitionTime
-             optionsMask:(uint8_t)optionsMask
-         optionsOverride:(uint8_t)optionsOverride
-       completionHandler:(ResponseHandler)completionHandler;
-- (void)stepColor:(int16_t)stepX
-                stepY:(int16_t)stepY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepColorTemperature:(uint8_t)stepMode
-                    stepSize:(uint16_t)stepSize
-              transitionTime:(uint16_t)transitionTime
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler;
-- (void)stepHue:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint8_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepSaturation:(uint8_t)stepMode
-              stepSize:(uint8_t)stepSize
-        transitionTime:(uint8_t)transitionTime
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler;
-- (void)stopMoveStep:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)moveColor:(int16_t)rateX rateY:(int16_t)rateY optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveColorTemperature:(uint8_t)moveMode rate:(uint16_t)rate colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveHue:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveSaturation:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToColor:(uint16_t)colorX colorY:(uint16_t)colorY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToColorTemperature:(uint16_t)colorTemperature transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToHue:(uint8_t)hue direction:(uint8_t)direction transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToHueAndSaturation:(uint8_t)hue saturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToSaturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepColor:(int16_t)stepX stepY:(int16_t)stepY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepColorTemperature:(uint8_t)stepMode stepSize:(uint16_t)stepSize transitionTime:(uint16_t)transitionTime colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepHue:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepSaturation:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stopMoveStep:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeCurrentHue:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentHue:(uint16_t)minInterval
-                         maxInterval:(uint16_t)maxInterval
-                              change:(uint8_t)change
-                   completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentHue:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentHue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentHue:(ResponseHandler)reportHandler;
 - (void)readAttributeCurrentSaturation:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
-                                maxInterval:(uint16_t)maxInterval
-                                     change:(uint8_t)change
-                          completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentSaturation:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentSaturation:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentSaturation:(ResponseHandler)reportHandler;
 - (void)readAttributeRemainingTime:(ResponseHandler)completionHandler;
 - (void)readAttributeCurrentX:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentX:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentX:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentX:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentX:(ResponseHandler)reportHandler;
 - (void)readAttributeCurrentY:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentY:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentY:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentY:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentY:(ResponseHandler)reportHandler;
 - (void)readAttributeDriftCompensation:(ResponseHandler)completionHandler;
 - (void)readAttributeCompensationText:(ResponseHandler)completionHandler;
 - (void)readAttributeColorTemperature:(ResponseHandler)completionHandler;
-- (void)configureAttributeColorTemperature:(uint16_t)minInterval
-                               maxInterval:(uint16_t)maxInterval
-                                    change:(uint16_t)change
-                         completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeColorTemperature:(ResponseHandler)reportHandler;
+- (void) configureAttributeColorTemperature:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeColorTemperature:(ResponseHandler)reportHandler;
 - (void)readAttributeColorMode:(ResponseHandler)completionHandler;
 - (void)readAttributeColorControlOptions:(ResponseHandler)completionHandler;
 - (void)writeAttributeColorControlOptions:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
@@ -300,9 +221,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Door Lock
- *
+ *    
  */
 @interface CHIPDoorLock : CHIPCluster
 
@@ -321,65 +244,35 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler;
 - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler;
 - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
-- (void)setHolidaySchedule:(uint8_t)scheduleId
-                localStartTime:(uint32_t)localStartTime
-                  localEndTime:(uint32_t)localEndTime
-    operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)setPin:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                  pin:(NSString *)pin
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)setRfid:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                   id:(NSString *)id
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)setHolidaySchedule:(uint8_t)scheduleId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday completionHandler:(ResponseHandler)completionHandler;
+- (void)setPin:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
+- (void)setRfid:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType id:(NSString *)id completionHandler:(ResponseHandler)completionHandler;
 - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandler:(ResponseHandler)completionHandler;
-- (void)setWeekdaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-                  daysMask:(uint8_t)daysMask
-                 startHour:(uint8_t)startHour
-               startMinute:(uint8_t)startMinute
-                   endHour:(uint8_t)endHour
-                 endMinute:(uint8_t)endMinute
-         completionHandler:(ResponseHandler)completionHandler;
-- (void)setYeardaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-            localStartTime:(uint32_t)localStartTime
-              localEndTime:(uint32_t)localEndTime
-         completionHandler:(ResponseHandler)completionHandler;
+- (void)setWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId daysMask:(uint8_t)daysMask startHour:(uint8_t)startHour startMinute:(uint8_t)startMinute endHour:(uint8_t)endHour endMinute:(uint8_t)endMinute completionHandler:(ResponseHandler)completionHandler;
+- (void)setYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime completionHandler:(ResponseHandler)completionHandler;
 - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
 - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeLockState:(ResponseHandler)completionHandler;
-- (void)configureAttributeLockState:(uint16_t)minInterval
-                        maxInterval:(uint16_t)maxInterval
-                  completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeLockState:(ResponseHandler)reportHandler;
+- (void) configureAttributeLockState:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeLockState:(ResponseHandler)reportHandler;
 - (void)readAttributeLockType:(ResponseHandler)completionHandler;
 - (void)readAttributeActuatorEnabled:(ResponseHandler)completionHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster General Commissioning
- *
+ *    
  */
 @interface CHIPGeneralCommissioning : CHIPCluster
 
-- (void)armFailSafe:(uint16_t)expiryLengthSeconds
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)armFailSafe:(uint16_t)expiryLengthSeconds breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler;
 - (void)commissioningComplete:(ResponseHandler)completionHandler;
-- (void)setFabric:(NSData *)fabricId
-         fabricSecret:(NSData *)fabricSecret
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)setFabric:(NSData *)fabricId fabricSecret:(NSData *)fabricSecret breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeFabricId:(ResponseHandler)completionHandler;
 - (void)readAttributeBreadcrumb:(ResponseHandler)completionHandler;
@@ -388,16 +281,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Groups
- *
+ *    
  */
 @interface CHIPGroups : CHIPCluster
 
 - (void)addGroup:(uint16_t)groupId groupName:(NSString *)groupName completionHandler:(ResponseHandler)completionHandler;
-- (void)addGroupIfIdentifying:(uint16_t)groupId
-                    groupName:(NSString *)groupName
-            completionHandler:(ResponseHandler)completionHandler;
+- (void)addGroupIfIdentifying:(uint16_t)groupId groupName:(NSString *)groupName completionHandler:(ResponseHandler)completionHandler;
 - (void)getGroupMembership:(uint8_t)groupCount groupList:(uint16_t)groupList completionHandler:(ResponseHandler)completionHandler;
 - (void)removeAllGroups:(ResponseHandler)completionHandler;
 - (void)removeGroup:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler;
@@ -408,9 +301,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Identify
- *
+ *    
  */
 @interface CHIPIdentify : CHIPCluster
 
@@ -423,52 +318,35 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Level Control
- *
+ *    
  */
 @interface CHIPLevelControl : CHIPCluster
 
-- (void)move:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToLevel:(uint8_t)level
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToLevelWithOnOff:(uint8_t)level
-              transitionTime:(uint16_t)transitionTime
-           completionHandler:(ResponseHandler)completionHandler;
+- (void)move:(uint8_t)moveMode rate:(uint8_t)rate optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToLevel:(uint8_t)level transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToLevelWithOnOff:(uint8_t)level transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler;
 - (void)moveWithOnOff:(uint8_t)moveMode rate:(uint8_t)rate completionHandler:(ResponseHandler)completionHandler;
-- (void)step:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepWithOnOff:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)step:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepWithOnOff:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler;
 - (void)stop:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
 - (void)stopWithOnOff:(ResponseHandler)completionHandler;
 
 - (void)readAttributeCurrentLevel:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentLevel:(uint16_t)minInterval
-                           maxInterval:(uint16_t)maxInterval
-                                change:(uint8_t)change
-                     completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentLevel:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentLevel:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentLevel:(ResponseHandler)reportHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster Low Power
- *
+ *    
  */
 @interface CHIPLowPower : CHIPCluster
 
@@ -478,9 +356,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster On/off
- *
+ *    
  */
 @interface CHIPOnOff : CHIPCluster
 
@@ -489,33 +369,23 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)toggle:(ResponseHandler)completionHandler;
 
 - (void)readAttributeOnOff:(ResponseHandler)completionHandler;
-- (void)configureAttributeOnOff:(uint16_t)minInterval
-                    maxInterval:(uint16_t)maxInterval
-              completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeOnOff:(ResponseHandler)reportHandler;
+- (void) configureAttributeOnOff:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeOnOff:(ResponseHandler)reportHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster Scenes
- *
+ *    
  */
 @interface CHIPScenes : CHIPCluster
 
-- (void)addScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-            sceneName:(NSString *)sceneName
-            clusterId:(uint16_t)clusterId
-               length:(uint8_t)length
-                value:(uint8_t)value
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)addScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime sceneName:(NSString *)sceneName clusterId:(uint16_t)clusterId length:(uint8_t)length value:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
 - (void)getSceneMembership:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler;
-- (void)recallScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)recallScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler;
 - (void)removeAllScenes:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler;
 - (void)removeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler;
 - (void)storeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler;
@@ -530,24 +400,25 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Temperature Measurement
- *
+ *    
  */
 @interface CHIPTemperatureMeasurement : CHIPCluster
 
+
 - (void)readAttributeMeasuredValue:(ResponseHandler)completionHandler;
-- (void)configureAttributeMeasuredValue:(uint16_t)minInterval
-                            maxInterval:(uint16_t)maxInterval
-                                 change:(int16_t)change
-                      completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeMeasuredValue:(ResponseHandler)reportHandler;
+- (void) configureAttributeMeasuredValue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(int16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeMeasuredValue:(ResponseHandler)reportHandler;
 - (void)readAttributeMinMeasuredValue:(ResponseHandler)completionHandler;
 - (void)readAttributeMaxMeasuredValue:(ResponseHandler)completionHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
 NS_ASSUME_NONNULL_END
 
 #endif /* CHIP_CLUSTERS_H */
diff --git a/examples/chip-tool/gen/CHIPClustersObjc.mm b/examples/chip-tool/gen/CHIPClustersObjc.mm
index 3a8c26eb57f995..e2e97c4ce7b55b 100644
--- a/examples/chip-tool/gen/CHIPClustersObjc.mm
+++ b/examples/chip-tool/gen/CHIPClustersObjc.mm
@@ -22,8 +22,8 @@
 #import "CHIPDevice.h"
 #import "CHIPDevice_Internal.h"
 #import "CHIPError.h"
-#import "gen/CHIPClientCallbacks.h"
 #import "gen/CHIPClustersObjc.h"
+#import "gen/CHIPClientCallbacks.h"
 
 #include <controller/CHIPClusters.h>
 #include <lib/support/Span.h>
@@ -105,17 +105,19 @@ static void CallbackFn(void * context, chip::ByteSpan value)
         CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                if (callback->mOctetString) {
-                    NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
-                    callback->mHandler(nil, @ { @"value" : data });
-                } else {
-                    NSString * str = [[NSString alloc] initWithBytes:value.data()
-                                                              length:value.size()
-                                                            encoding:NSUTF8StringEncoding];
-                    callback->mHandler(nil, @ { @"value" : str });
+                if (callback->mOctetString)
+                {
+                    NSData *data = [NSData dataWithBytes: value.data() length: value.size()];
+                    callback->mHandler(nil, @{ @"value": data });
+                }
+                else
+                {
+                    NSString * str = [[NSString alloc] initWithBytes:value.data() length:value.size() encoding:NSUTF8StringEncoding];
+                    callback->mHandler(nil, @{ @"value": str });
                 }
 
-                if (!callback->mKeepAlive) {
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -147,8 +149,9 @@ static void CallbackFn(void * context, bool value)
         CHIPBooleanAttributeCallbackBridge * callback = reinterpret_cast<CHIPBooleanAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithBool:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithBool:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -179,8 +182,9 @@ static void CallbackFn(void * context, uint8_t value)
         CHIPInt8uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt8uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedChar:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedChar:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -211,8 +215,9 @@ static void CallbackFn(void * context, int8_t value)
         CHIPInt8sAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt8sAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithChar:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithChar:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -243,8 +248,9 @@ static void CallbackFn(void * context, uint16_t value)
         CHIPInt16uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt16uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedShort:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedShort:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -275,8 +281,9 @@ static void CallbackFn(void * context, uint32_t value)
         CHIPInt32uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt32uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedLong:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedLong:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -307,8 +314,9 @@ static void CallbackFn(void * context, uint64_t value)
         CHIPInt64uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt64uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedLongLong:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedLongLong:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -339,8 +347,9 @@ static void CallbackFn(void * context, int16_t value)
         CHIPInt16sAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt16sAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithShort:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithShort:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -354,25 +363,21 @@ static void CallbackFn(void * context, int16_t value)
     bool mKeepAlive;
 };
 
-class CHIPDoorLockClusterClearAllPinsResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> {
+class CHIPDoorLockClusterClearAllPinsResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearAllPinsResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -384,25 +389,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> {
+class CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -414,25 +415,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> {
+class CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -444,24 +441,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearPinResponseCallback> {
+class CHIPDoorLockClusterClearPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearPinResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearPinResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearPinResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearPinResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -473,24 +467,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearRfidResponseCallback> {
+class CHIPDoorLockClusterClearRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearRfidResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearRfidResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearRfidResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearRfidResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -502,25 +493,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> {
+class CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -532,25 +519,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> {
+class CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -562,31 +545,25 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> {
+class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge() {};
 
-    static void CallbackFn(
-        void * context, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+    static void CallbackFn(void * context, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
     {
-        CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"scheduleId" : [NSNumber numberWithUnsignedChar:scheduleId],
-                    @"localStartTime" : [NSNumber numberWithUnsignedLong:localStartTime],
-                    @"localEndTime" : [NSNumber numberWithUnsignedLong:localEndTime],
-                    @"operatingModeDuringHoliday" : [NSNumber numberWithUnsignedChar:operatingModeDuringHoliday],
-                });
+                callback->mHandler(nil, @{
+                  @"scheduleId": [NSNumber numberWithUnsignedChar:scheduleId],
+                                    @"localStartTime": [NSNumber numberWithUnsignedLong:localStartTime],
+                                    @"localEndTime": [NSNumber numberWithUnsignedLong:localEndTime],
+                                    @"operatingModeDuringHoliday": [NSNumber numberWithUnsignedChar:operatingModeDuringHoliday],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -598,33 +575,27 @@ static void CallbackFn(
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetLogRecordResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> {
+class CHIPDoorLockClusterGetLogRecordResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetLogRecordResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
+    static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
     {
-        CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"logEntryId" : [NSNumber numberWithUnsignedShort:logEntryId],
-                    @"timestamp" : [NSNumber numberWithUnsignedLong:timestamp],
-                    @"eventType" : [NSNumber numberWithUnsignedChar:eventType],
-                    @"source" : [NSNumber numberWithUnsignedChar:source],
-                    @"eventIdOrAlarmCode" : [NSNumber numberWithUnsignedChar:eventIdOrAlarmCode],
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"pin" : [NSString stringWithFormat:@"%s", pin],
+                callback->mHandler(nil, @{
+                  @"logEntryId": [NSNumber numberWithUnsignedShort:logEntryId],
+                                    @"timestamp": [NSNumber numberWithUnsignedLong:timestamp],
+                                    @"eventType": [NSNumber numberWithUnsignedChar:eventType],
+                                    @"source": [NSNumber numberWithUnsignedChar:source],
+                                    @"eventIdOrAlarmCode": [NSNumber numberWithUnsignedChar:eventIdOrAlarmCode],
+                                    @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"pin": [NSString stringWithFormat:@"%s", pin],
                 });
                 callback->Cancel();
                 delete callback;
@@ -637,28 +608,24 @@ static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp,
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetPinResponseCallback> {
+class CHIPDoorLockClusterGetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetPinResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetPinResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin)
     {
-        CHIPDoorLockClusterGetPinResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetPinResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"userStatus" : [NSNumber numberWithUnsignedChar:userStatus],
-                    @"userType" : [NSNumber numberWithUnsignedChar:userType],
-                    @"pin" : [NSString stringWithFormat:@"%s", pin],
+                callback->mHandler(nil, @{
+                  @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"userStatus": [NSNumber numberWithUnsignedChar:userStatus],
+                                    @"userType": [NSNumber numberWithUnsignedChar:userType],
+                                    @"pin": [NSString stringWithFormat:@"%s", pin],
                 });
                 callback->Cancel();
                 delete callback;
@@ -671,28 +638,24 @@ static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetRfidResponseCallback> {
+class CHIPDoorLockClusterGetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetRfidResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetRfidResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid)
     {
-        CHIPDoorLockClusterGetRfidResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetRfidResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"userStatus" : [NSNumber numberWithUnsignedChar:userStatus],
-                    @"userType" : [NSNumber numberWithUnsignedChar:userType],
-                    @"rfid" : [NSString stringWithFormat:@"%s", rfid],
+                callback->mHandler(nil, @{
+                  @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"userStatus": [NSNumber numberWithUnsignedChar:userStatus],
+                                    @"userType": [NSNumber numberWithUnsignedChar:userType],
+                                    @"rfid": [NSString stringWithFormat:@"%s", rfid],
                 });
                 callback->Cancel();
                 delete callback;
@@ -705,27 +668,23 @@ static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> {
+class CHIPDoorLockClusterGetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetUserTypeResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
     {
-        CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"userType" : [NSNumber numberWithUnsignedChar:userType],
-                });
+                callback->mHandler(nil, @{
+                  @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"userType": [NSNumber numberWithUnsignedChar:userType],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -737,34 +696,28 @@ static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> {
+class CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour,
-        uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
     {
-        CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"scheduleId" : [NSNumber numberWithUnsignedChar:scheduleId],
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"daysMask" : [NSNumber numberWithUnsignedChar:daysMask],
-                    @"startHour" : [NSNumber numberWithUnsignedChar:startHour],
-                    @"startMinute" : [NSNumber numberWithUnsignedChar:startMinute],
-                    @"endHour" : [NSNumber numberWithUnsignedChar:endHour],
-                    @"endMinute" : [NSNumber numberWithUnsignedChar:endMinute],
-                });
+                callback->mHandler(nil, @{
+                  @"scheduleId": [NSNumber numberWithUnsignedChar:scheduleId],
+                                    @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"daysMask": [NSNumber numberWithUnsignedChar:daysMask],
+                                    @"startHour": [NSNumber numberWithUnsignedChar:startHour],
+                                    @"startMinute": [NSNumber numberWithUnsignedChar:startMinute],
+                                    @"endHour": [NSNumber numberWithUnsignedChar:endHour],
+                                    @"endMinute": [NSNumber numberWithUnsignedChar:endMinute],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -776,30 +729,25 @@ static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> {
+class CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime)
     {
-        CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"scheduleId" : [NSNumber numberWithUnsignedChar:scheduleId],
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"localStartTime" : [NSNumber numberWithUnsignedLong:localStartTime],
-                    @"localEndTime" : [NSNumber numberWithUnsignedLong:localEndTime],
-                });
+                callback->mHandler(nil, @{
+                  @"scheduleId": [NSNumber numberWithUnsignedChar:scheduleId],
+                                    @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"localStartTime": [NSNumber numberWithUnsignedLong:localStartTime],
+                                    @"localEndTime": [NSNumber numberWithUnsignedLong:localEndTime],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -811,24 +759,21 @@ static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterLockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterLockDoorResponseCallback> {
+class CHIPDoorLockClusterLockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterLockDoorResponseCallback>
+{
 public:
-    CHIPDoorLockClusterLockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterLockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterLockDoorResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterLockDoorResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterLockDoorResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -840,25 +785,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> {
+class CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -870,24 +811,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetPinResponseCallback> {
+class CHIPDoorLockClusterSetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetPinResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetPinResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetPinResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetPinResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -899,24 +837,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetRfidResponseCallback> {
+class CHIPDoorLockClusterSetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetRfidResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetRfidResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetRfidResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetRfidResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -928,24 +863,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> {
+class CHIPDoorLockClusterSetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetUserTypeResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -957,25 +889,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> {
+class CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -987,25 +915,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> {
+class CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -1017,24 +941,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterUnlockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> {
+class CHIPDoorLockClusterUnlockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>
+{
 public:
-    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterUnlockDoorResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -1046,25 +967,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> {
+class CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>
+{
 public:
-    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -1076,27 +993,22 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge
-    : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> {
+class CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>
+{
 public:
-    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * callback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"errorCode" : [NSNumber numberWithUnsignedChar:errorCode],
-                    @"debugText" : [NSString stringWithFormat:@"%s", debugText],
+                callback->mHandler(nil, @{
+                  @"errorCode": [NSNumber numberWithUnsignedChar:errorCode],
+                                    @"debugText": [NSString stringWithFormat:@"%s", debugText],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1109,27 +1021,22 @@ static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge
-    : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> {
+class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>
+{
 public:
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * callback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"errorCode" : [NSNumber numberWithUnsignedChar:errorCode],
-                    @"debugText" : [NSString stringWithFormat:@"%s", debugText],
+                callback->mHandler(nil, @{
+                  @"errorCode": [NSNumber numberWithUnsignedChar:errorCode],
+                                    @"debugText": [NSString stringWithFormat:@"%s", debugText],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1142,27 +1049,22 @@ static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge
-    : public Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> {
+class CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge : public Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>
+{
 public:
-    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * callback = reinterpret_cast<CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"errorCode" : [NSNumber numberWithUnsignedChar:errorCode],
-                    @"debugText" : [NSString stringWithFormat:@"%s", debugText],
+                callback->mHandler(nil, @{
+                  @"errorCode": [NSNumber numberWithUnsignedChar:errorCode],
+                                    @"debugText": [NSString stringWithFormat:@"%s", debugText],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1175,26 +1077,22 @@ static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterAddGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterAddGroupResponseCallback> {
+class CHIPGroupsClusterAddGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterAddGroupResponseCallback>
+{
 public:
-    CHIPGroupsClusterAddGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterAddGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterAddGroupResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId)
     {
-        CHIPGroupsClusterAddGroupResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterAddGroupResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1206,30 +1104,24 @@ static void CallbackFn(void * context, uint16_t groupId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge
-    : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> {
+class CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>
+{
 public:
-    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge() {};
 
-    static void CallbackFn(
-        void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
+    static void CallbackFn(void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList)
     {
-        CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"capacity" : [NSNumber numberWithUnsignedChar:capacity],
-                    @"groupCount" : [NSNumber numberWithUnsignedChar:groupCount],
-                    // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
-                    // Conversion from this type to Objc is not properly implemented yet
+                callback->mHandler(nil, @{
+                  @"capacity": [NSNumber numberWithUnsignedChar:capacity],
+                                    @"groupCount": [NSNumber numberWithUnsignedChar:groupCount],
+                                    // groupList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                  // Conversion from this type to Objc is not properly implemented yet
                 });
                 callback->Cancel();
                 delete callback;
@@ -1242,26 +1134,22 @@ static void CallbackFn(
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterRemoveGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback> {
+class CHIPGroupsClusterRemoveGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback>
+{
 public:
-    CHIPGroupsClusterRemoveGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterRemoveGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterRemoveGroupResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId)
     {
-        CHIPGroupsClusterRemoveGroupResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterRemoveGroupResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1273,26 +1161,22 @@ static void CallbackFn(void * context, uint16_t groupId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterViewGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterViewGroupResponseCallback> {
+class CHIPGroupsClusterViewGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterViewGroupResponseCallback>
+{
 public:
-    CHIPGroupsClusterViewGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterViewGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterViewGroupResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t * groupName)
     {
-        CHIPGroupsClusterViewGroupResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterViewGroupResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"groupName" : [NSString stringWithFormat:@"%s", groupName],
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"groupName": [NSString stringWithFormat:@"%s", groupName],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1305,27 +1189,22 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t * groupName)
     dispatch_queue_t mQueue;
 };
 
-class CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge
-    : public Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> {
+class CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge : public Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>
+{
 public:
-    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t timeout)
     {
-        CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * callback = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"timeout" : [NSNumber numberWithUnsignedShort:timeout],
-                });
+                callback->mHandler(nil, @{
+                  @"timeout": [NSNumber numberWithUnsignedShort:timeout],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1337,27 +1216,23 @@ static void CallbackFn(void * context, uint16_t timeout)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterAddSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterAddSceneResponseCallback> {
+class CHIPScenesClusterAddSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterAddSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterAddSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterAddSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterAddSceneResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     {
-        CHIPScenesClusterAddSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterAddSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1369,31 +1244,25 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterGetSceneMembershipResponseCallbackBridge
-    : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> {
+class CHIPScenesClusterGetSceneMembershipResponseCallbackBridge : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>
+{
 public:
-    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterGetSceneMembershipResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-        /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
+    static void CallbackFn(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList)
     {
-        CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"capacity" : [NSNumber numberWithUnsignedChar:capacity],
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneCount" : [NSNumber numberWithUnsignedChar:sceneCount],
-                    // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
-                    // Conversion from this type to Objc is not properly implemented yet
+                callback->mHandler(nil, @{
+                  @"capacity": [NSNumber numberWithUnsignedChar:capacity],
+                                    @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneCount": [NSNumber numberWithUnsignedChar:sceneCount],
+                                    // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                  // Conversion from this type to Objc is not properly implemented yet
                 });
                 callback->Cancel();
                 delete callback;
@@ -1406,27 +1275,22 @@ static void CallbackFn(void * context, uint8_t capacity, uint16_t groupId, uint8
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterRemoveAllScenesResponseCallbackBridge
-    : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> {
+class CHIPScenesClusterRemoveAllScenesResponseCallbackBridge : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>
+{
 public:
-    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterRemoveAllScenesResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId)
     {
-        CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1438,27 +1302,23 @@ static void CallbackFn(void * context, uint16_t groupId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterRemoveSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback> {
+class CHIPScenesClusterRemoveSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterRemoveSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterRemoveSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterRemoveSceneResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     {
-        CHIPScenesClusterRemoveSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterRemoveSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1470,27 +1330,23 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterStoreSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterStoreSceneResponseCallback> {
+class CHIPScenesClusterStoreSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterStoreSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterStoreSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterStoreSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterStoreSceneResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     {
-        CHIPScenesClusterStoreSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterStoreSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1502,31 +1358,26 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterViewSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterViewSceneResponseCallback> {
+class CHIPScenesClusterViewSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterViewSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterViewSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterViewSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterViewSceneResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
-        /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
+    static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
     {
-        CHIPScenesClusterViewSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterViewSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                    @"transitionTime" : [NSNumber numberWithUnsignedShort:transitionTime],
-                    @"sceneName" : [NSString stringWithFormat:@"%s", sceneName],
-                    // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
-                    // Conversion from this type to Objc is not properly implemented yet
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                    @"transitionTime": [NSNumber numberWithUnsignedShort:transitionTime],
+                                    @"sceneName": [NSString stringWithFormat:@"%s", sceneName],
+                  // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                  // Conversion from this type to Objc is not properly implemented yet
                 });
                 callback->Cancel();
                 delete callback;
@@ -1539,6 +1390,7 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId, uint16
     dispatch_queue_t mQueue;
 };
 
+
 @interface CHIPCluster ()
 @property (readonly, nonatomic) dispatch_queue_t callbackQueue;
 - (Controller::ClusterBase *)getCluster;
@@ -1549,7 +1401,8 @@ - (instancetype)initWithDevice:(CHIPDevice *)device endpoint:(EndpointId)endpoin
 {
     if (self = [super init]) {
         Controller::ClusterBase * cppCluster = [self getCluster];
-        if (cppCluster == nullptr) {
+        if (cppCluster == nullptr)
+        {
             return nil;
         }
 
@@ -1569,6 +1422,8 @@ - (instancetype)initWithDevice:(CHIPDevice *)device endpoint:(EndpointId)endpoin
 }
 @end
 
+
+
 @interface CHIPApplicationBasic ()
 @property (readonly) Controller::ApplicationBasicCluster cppCluster;
 @end
@@ -1580,10 +1435,10 @@ @implementation CHIPApplicationBasic
     return &_cppCluster;
 }
 
+
 - (void)readAttributeVendorName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -1629,8 +1484,7 @@ - (void)readAttributeVendorId:(ResponseHandler)completionHandler
 
 - (void)readAttributeApplicationName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -1676,8 +1530,7 @@ - (void)readAttributeProductId:(ResponseHandler)completionHandler
 
 - (void)readAttributeApplicationId:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -1767,8 +1620,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPBarrierControl ()
 @property (readonly) Controller::BarrierControlCluster cppCluster;
 @end
@@ -1940,8 +1795,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPBasic ()
 @property (readonly) Controller::BasicCluster cppCluster;
 @end
@@ -2001,8 +1858,7 @@ - (void)readAttributeInteractionModelVersion:(ResponseHandler)completionHandler
 
 - (void)readAttributeVendorName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2048,8 +1904,7 @@ - (void)readAttributeVendorID:(ResponseHandler)completionHandler
 
 - (void)readAttributeProductName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2095,8 +1950,7 @@ - (void)readAttributeProductID:(ResponseHandler)completionHandler
 
 - (void)readAttributeUserLabel:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2133,8 +1987,7 @@ - (void)writeAttributeUserLabel:(NSString *)value completionHandler:(ResponseHan
     }
 
     NSData * data = [value dataUsingEncoding:NSUTF8StringEncoding];
-    CHIP_ERROR err = self.cppCluster.WriteAttributeUserLabel(
-        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) data.bytes, data.length));
+    CHIP_ERROR err = self.cppCluster.WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)data.bytes, data.length));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2144,8 +1997,7 @@ - (void)writeAttributeUserLabel:(NSString *)value completionHandler:(ResponseHan
 
 - (void)readAttributeLocation:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2182,8 +2034,7 @@ - (void)writeAttributeLocation:(NSString *)value completionHandler:(ResponseHand
     }
 
     NSData * data = [value dataUsingEncoding:NSUTF8StringEncoding];
-    CHIP_ERROR err = self.cppCluster.WriteAttributeLocation(
-        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) data.bytes, data.length));
+    CHIP_ERROR err = self.cppCluster.WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)data.bytes, data.length));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2216,8 +2067,7 @@ - (void)readAttributeHardwareVersion:(ResponseHandler)completionHandler
 
 - (void)readAttributeHardwareVersionString:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2263,8 +2113,7 @@ - (void)readAttributeSoftwareVersion:(ResponseHandler)completionHandler
 
 - (void)readAttributeSoftwareVersionString:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2308,8 +2157,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPBinding ()
 @property (readonly) Controller::BindingCluster cppCluster;
 @end
@@ -2321,11 +2172,7 @@ @implementation CHIPBinding
     return &_cppCluster;
 }
 
-- (void)bind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler
+- (void)bind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2347,11 +2194,7 @@ - (void)bind:(uint64_t)nodeId
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)unbind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler
+- (void)unbind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2397,8 +2240,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPColorControl ()
 @property (readonly) Controller::ColorControlCluster cppCluster;
 @end
@@ -2410,11 +2255,7 @@ @implementation CHIPColorControl
     return &_cppCluster;
 }
 
-- (void)moveColor:(int16_t)rateX
-                rateY:(int16_t)rateY
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveColor:(int16_t)rateX rateY:(int16_t)rateY optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2429,21 +2270,14 @@ - (void)moveColor:(int16_t)rateX
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveColorTemperature:(uint8_t)moveMode
-                        rate:(uint16_t)rate
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler
+- (void)moveColorTemperature:(uint8_t)moveMode rate:(uint16_t)rate colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2458,19 +2292,14 @@ - (void)moveColorTemperature:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate,
-        colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveHue:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveHue:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2485,19 +2314,14 @@ - (void)moveHue:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveHue(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveHue(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveSaturation:(uint8_t)moveMode
-                  rate:(uint8_t)rate
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler
+- (void)moveSaturation:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2512,20 +2336,14 @@ - (void)moveSaturation:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveSaturation(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveSaturation(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToColor:(uint16_t)colorX
-               colorY:(uint16_t)colorY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToColor:(uint16_t)colorX colorY:(uint16_t)colorY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2540,19 +2358,14 @@ - (void)moveToColor:(uint16_t)colorX
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToColor(
-        onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToColor(onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToColorTemperature:(uint16_t)colorTemperature
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler
+- (void)moveToColorTemperature:(uint16_t)colorTemperature transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2567,20 +2380,14 @@ - (void)moveToColorTemperature:(uint16_t)colorTemperature
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToColorTemperature(
-        onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToHue:(uint8_t)hue
-            direction:(uint8_t)direction
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToHue:(uint8_t)hue direction:(uint8_t)direction transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2595,20 +2402,14 @@ - (void)moveToHue:(uint8_t)hue
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToHue(
-        onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToHueAndSaturation:(uint8_t)hue
-                    saturation:(uint8_t)saturation
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler
+- (void)moveToHueAndSaturation:(uint8_t)hue saturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2623,19 +2424,14 @@ - (void)moveToHueAndSaturation:(uint8_t)hue
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToHueAndSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToSaturation:(uint8_t)saturation
-          transitionTime:(uint16_t)transitionTime
-             optionsMask:(uint8_t)optionsMask
-         optionsOverride:(uint8_t)optionsOverride
-       completionHandler:(ResponseHandler)completionHandler
+- (void)moveToSaturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2650,20 +2446,14 @@ - (void)moveToSaturation:(uint8_t)saturation
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToSaturation(onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepColor:(int16_t)stepX
-                stepY:(int16_t)stepY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepColor:(int16_t)stepX stepY:(int16_t)stepY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2678,22 +2468,14 @@ - (void)stepColor:(int16_t)stepX
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepColor(
-        onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepColor(onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepColorTemperature:(uint8_t)stepMode
-                    stepSize:(uint16_t)stepSize
-              transitionTime:(uint16_t)transitionTime
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler
+- (void)stepColorTemperature:(uint8_t)stepMode stepSize:(uint16_t)stepSize transitionTime:(uint16_t)transitionTime colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2708,20 +2490,14 @@ - (void)stepColorTemperature:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize,
-        transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepHue:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint8_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepHue:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2736,20 +2512,14 @@ - (void)stepHue:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepHue(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepSaturation:(uint8_t)stepMode
-              stepSize:(uint8_t)stepSize
-        transitionTime:(uint8_t)transitionTime
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler
+- (void)stepSaturation:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2764,17 +2534,14 @@ - (void)stepSaturation:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stopMoveStep:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stopMoveStep:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2820,10 +2587,7 @@ - (void)readAttributeCurrentHue:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentHue:(uint16_t)minInterval
-                         maxInterval:(uint16_t)maxInterval
-                              change:(uint8_t)change
-                   completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentHue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2838,8 +2602,8 @@ - (void)configureAttributeCurrentHue:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2847,7 +2611,7 @@ - (void)configureAttributeCurrentHue:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentHue:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentHue:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -2885,10 +2649,7 @@ - (void)readAttributeCurrentSaturation:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
-                                maxInterval:(uint16_t)maxInterval
-                                     change:(uint8_t)change
-                          completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentSaturation:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2903,8 +2664,8 @@ - (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2912,7 +2673,7 @@ - (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentSaturation:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentSaturation:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -2973,10 +2734,7 @@ - (void)readAttributeCurrentX:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentX:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentX:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2991,8 +2749,8 @@ - (void)configureAttributeCurrentX:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3000,7 +2758,7 @@ - (void)configureAttributeCurrentX:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentX:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentX:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -3038,10 +2796,7 @@ - (void)readAttributeCurrentY:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentY:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentY:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3056,8 +2811,8 @@ - (void)configureAttributeCurrentY:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3065,7 +2820,7 @@ - (void)configureAttributeCurrentY:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentY:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentY:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -3105,8 +2860,7 @@ - (void)readAttributeDriftCompensation:(ResponseHandler)completionHandler
 
 - (void)readAttributeCompensationText:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -3150,10 +2904,7 @@ - (void)readAttributeColorTemperature:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeColorTemperature:(uint16_t)minInterval
-                               maxInterval:(uint16_t)maxInterval
-                                    change:(uint16_t)change
-                         completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeColorTemperature:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3168,8 +2919,8 @@ - (void)configureAttributeColorTemperature:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeColorTemperature(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3177,7 +2928,7 @@ - (void)configureAttributeColorTemperature:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeColorTemperature:(ResponseHandler)reportHandler
+- (void) reportAttributeColorTemperature:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -3254,7 +3005,7 @@ - (void)writeAttributeColorControlOptions:(uint8_t)value completionHandler:(Resp
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorControlOptions(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3737,7 +3488,7 @@ - (void)writeAttributeWhitePointX:(uint16_t)value completionHandler:(ResponseHan
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeWhitePointX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3783,7 +3534,7 @@ - (void)writeAttributeWhitePointY:(uint16_t)value completionHandler:(ResponseHan
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeWhitePointY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3829,7 +3580,7 @@ - (void)writeAttributeColorPointRX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3875,7 +3626,7 @@ - (void)writeAttributeColorPointRY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3921,7 +3672,7 @@ - (void)writeAttributeColorPointRIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3967,7 +3718,7 @@ - (void)writeAttributeColorPointGX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4013,7 +3764,7 @@ - (void)writeAttributeColorPointGY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4059,7 +3810,7 @@ - (void)writeAttributeColorPointGIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4105,7 +3856,7 @@ - (void)writeAttributeColorPointBX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4151,7 +3902,7 @@ - (void)writeAttributeColorPointBY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4197,7 +3948,7 @@ - (void)writeAttributeColorPointBIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4450,7 +4201,7 @@ - (void)writeAttributeStartUpColorTemperatureMireds:(uint16_t)value completionHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4480,8 +4231,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPDoorLock ()
 @property (readonly) Controller::DoorLockCluster cppCluster;
 @end
@@ -4495,8 +4248,7 @@ @implementation CHIPDoorLock
 
 - (void)clearAllPins:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4518,8 +4270,7 @@ - (void)clearAllPins:(ResponseHandler)completionHandler
 }
 - (void)clearAllRfids:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4541,8 +4292,7 @@ - (void)clearAllRfids:(ResponseHandler)completionHandler
 }
 - (void)clearHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4564,8 +4314,7 @@ - (void)clearHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHand
 }
 - (void)clearPin:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearPinResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearPinResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4587,8 +4336,7 @@ - (void)clearPin:(uint16_t)userId completionHandler:(ResponseHandler)completionH
 }
 - (void)clearRfid:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearRfidResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearRfidResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4610,8 +4358,7 @@ - (void)clearRfid:(uint16_t)userId completionHandler:(ResponseHandler)completion
 }
 - (void)clearWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4633,8 +4380,7 @@ - (void)clearWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId complet
 }
 - (void)clearYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4656,8 +4402,7 @@ - (void)clearYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId complet
 }
 - (void)getHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4679,8 +4424,7 @@ - (void)getHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHandle
 }
 - (void)getLogRecord:(uint16_t)logIndex completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4702,8 +4446,7 @@ - (void)getLogRecord:(uint16_t)logIndex completionHandler:(ResponseHandler)compl
 }
 - (void)getPin:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetPinResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetPinResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4725,8 +4468,7 @@ - (void)getPin:(uint16_t)userId completionHandler:(ResponseHandler)completionHan
 }
 - (void)getRfid:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetRfidResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetRfidResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4748,8 +4490,7 @@ - (void)getRfid:(uint16_t)userId completionHandler:(ResponseHandler)completionHa
 }
 - (void)getUserType:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4771,8 +4512,7 @@ - (void)getUserType:(uint16_t)userId completionHandler:(ResponseHandler)completi
 }
 - (void)getWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4794,8 +4534,7 @@ - (void)getWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completio
 }
 - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4817,8 +4556,7 @@ - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completio
 }
 - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterLockDoorResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterLockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterLockDoorResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterLockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4831,23 +4569,16 @@ - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHa
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.LockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.LockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setHolidaySchedule:(uint8_t)scheduleId
-                localStartTime:(uint32_t)localStartTime
-                  localEndTime:(uint32_t)localEndTime
-    operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday
-             completionHandler:(ResponseHandler)completionHandler
+- (void)setHolidaySchedule:(uint8_t)scheduleId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4860,22 +4591,16 @@ - (void)setHolidaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetHolidaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+    CHIP_ERROR err = self.cppCluster.SetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setPin:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                  pin:(NSString *)pin
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setPin:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetPinResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetPinResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4888,23 +4613,16 @@ - (void)setPin:(uint16_t)userId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setRfid:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                   id:(NSString *)id
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setRfid:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType id:(NSString *)id completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetRfidResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetRfidResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4917,9 +4635,7 @@ - (void)setRfid:(uint16_t)userId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-        chip::ByteSpan((const uint8_t *) [id dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*)[id dataUsingEncoding:NSUTF8StringEncoding].bytes, [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -4928,8 +4644,7 @@ - (void)setRfid:(uint16_t)userId
 }
 - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4949,17 +4664,9 @@ - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandle
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setWeekdaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-                  daysMask:(uint8_t)daysMask
-                 startHour:(uint8_t)startHour
-               startMinute:(uint8_t)startMinute
-                   endHour:(uint8_t)endHour
-                 endMinute:(uint8_t)endMinute
-         completionHandler:(ResponseHandler)completionHandler
+- (void)setWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId daysMask:(uint8_t)daysMask startHour:(uint8_t)startHour startMinute:(uint8_t)startMinute endHour:(uint8_t)endHour endMinute:(uint8_t)endMinute completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4972,22 +4679,16 @@ - (void)setWeekdaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetWeekdaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+    CHIP_ERROR err = self.cppCluster.SetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setYeardaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-            localStartTime:(uint32_t)localStartTime
-              localEndTime:(uint32_t)localEndTime
-         completionHandler:(ResponseHandler)completionHandler
+- (void)setYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5000,8 +4701,7 @@ - (void)setYeardaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetYeardaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
+    CHIP_ERROR err = self.cppCluster.SetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5010,8 +4710,7 @@ - (void)setYeardaySchedule:(uint8_t)scheduleId
 }
 - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5024,9 +4723,7 @@ - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completion
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5035,8 +4732,7 @@ - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completion
 }
 - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5049,9 +4745,7 @@ - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin complet
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds,
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds, chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5082,9 +4776,7 @@ - (void)readAttributeLockState:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeLockState:(uint16_t)minInterval
-                        maxInterval:(uint16_t)maxInterval
-                  completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeLockState:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5099,8 +4791,8 @@ - (void)configureAttributeLockState:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5108,7 +4800,7 @@ - (void)configureAttributeLockState:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeLockState:(ResponseHandler)reportHandler
+- (void) reportAttributeLockState:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -5148,8 +4840,7 @@ - (void)readAttributeLockType:(ResponseHandler)completionHandler
 
 - (void)readAttributeActuatorEnabled:(ResponseHandler)completionHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onSuccess
-        = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPBooleanAttributeCallbackBridge * onSuccess = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5193,8 +4884,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPGeneralCommissioning ()
 @property (readonly) Controller::GeneralCommissioningCluster cppCluster;
 @end
@@ -5206,13 +4899,9 @@ @implementation CHIPGeneralCommissioning
     return &_cppCluster;
 }
 
-- (void)armFailSafe:(uint16_t)expiryLengthSeconds
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler
+- (void)armFailSafe:(uint16_t)expiryLengthSeconds breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * onSuccess
-        = new CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * onSuccess = new CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5225,8 +4914,7 @@ - (void)armFailSafe:(uint16_t)expiryLengthSeconds
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ArmFailSafe(onSuccess->Cancel(), onFailure->Cancel(), expiryLengthSeconds, breadcrumb, timeoutMs);
+    CHIP_ERROR err = self.cppCluster.ArmFailSafe(onSuccess->Cancel(), onFailure->Cancel(), expiryLengthSeconds, breadcrumb, timeoutMs);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5235,8 +4923,7 @@ - (void)armFailSafe:(uint16_t)expiryLengthSeconds
 }
 - (void)commissioningComplete:(ResponseHandler)completionHandler
 {
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * onSuccess
-        = new CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * onSuccess = new CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5256,14 +4943,9 @@ - (void)commissioningComplete:(ResponseHandler)completionHandler
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setFabric:(NSData *)fabricId
-         fabricSecret:(NSData *)fabricSecret
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setFabric:(NSData *)fabricId fabricSecret:(NSData *)fabricSecret breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * onSuccess
-        = new CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * onSuccess = new CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5276,9 +4958,7 @@ - (void)setFabric:(NSData *)fabricId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetFabric(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) fabricId.bytes, fabricId.length),
-        chip::ByteSpan((const uint8_t *) fabricSecret.bytes, fabricSecret.length), breadcrumb, timeoutMs);
+    CHIP_ERROR err = self.cppCluster.SetFabric(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)fabricId.bytes, fabricId.length), chip::ByteSpan((const uint8_t*)fabricSecret.bytes, fabricSecret.length), breadcrumb, timeoutMs);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5288,8 +4968,7 @@ - (void)setFabric:(NSData *)fabricId
 
 - (void)readAttributeFabricId:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5349,7 +5028,7 @@ - (void)writeAttributeBreadcrumb:(uint64_t)value completionHandler:(ResponseHand
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeBreadcrumb(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -5379,8 +5058,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPGroups ()
 @property (readonly) Controller::GroupsCluster cppCluster;
 @end
@@ -5394,8 +5075,7 @@ @implementation CHIPGroups
 
 - (void)addGroup:(uint16_t)groupId groupName:(NSString *)groupName completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterAddGroupResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterAddGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterAddGroupResponseCallbackBridge * onSuccess = new CHIPGroupsClusterAddGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5408,9 +5088,7 @@ - (void)addGroup:(uint16_t)groupId groupName:(NSString *)groupName completionHan
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-        chip::ByteSpan((const uint8_t *) [groupName dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::ByteSpan((const uint8_t*)[groupName dataUsingEncoding:NSUTF8StringEncoding].bytes, [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5432,9 +5110,7 @@ - (void)addGroupIfIdentifying:(uint16_t)groupId groupName:(NSString *)groupName
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-        chip::ByteSpan((const uint8_t *) [groupName dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::ByteSpan((const uint8_t*)[groupName dataUsingEncoding:NSUTF8StringEncoding].bytes, [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5443,8 +5119,7 @@ - (void)addGroupIfIdentifying:(uint16_t)groupId groupName:(NSString *)groupName
 }
 - (void)getGroupMembership:(uint8_t)groupCount groupList:(uint16_t)groupList completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * onSuccess = new CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5488,8 +5163,7 @@ - (void)removeAllGroups:(ResponseHandler)completionHandler
 }
 - (void)removeGroup:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterRemoveGroupResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterRemoveGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterRemoveGroupResponseCallbackBridge * onSuccess = new CHIPGroupsClusterRemoveGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5511,8 +5185,7 @@ - (void)removeGroup:(uint16_t)groupId completionHandler:(ResponseHandler)complet
 }
 - (void)viewGroup:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterViewGroupResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterViewGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterViewGroupResponseCallbackBridge * onSuccess = new CHIPGroupsClusterViewGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5579,8 +5252,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPIdentify ()
 @property (readonly) Controller::IdentifyCluster cppCluster;
 @end
@@ -5616,8 +5291,7 @@ - (void)identify:(uint16_t)identifyTime completionHandler:(ResponseHandler)compl
 }
 - (void)identifyQuery:(ResponseHandler)completionHandler
 {
-    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * onSuccess
-        = new CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * onSuccess = new CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5677,7 +5351,7 @@ - (void)writeAttributeIdentifyTime:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeIdentifyTime(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -5707,8 +5381,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPLevelControl ()
 @property (readonly) Controller::LevelControlCluster cppCluster;
 @end
@@ -5720,11 +5396,7 @@ @implementation CHIPLevelControl
     return &_cppCluster;
 }
 
-- (void)move:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)move:(uint8_t)moveMode rate:(uint8_t)rate optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5746,11 +5418,7 @@ - (void)move:(uint8_t)moveMode
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToLevel:(uint8_t)level
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToLevel:(uint8_t)level transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5765,17 +5433,14 @@ - (void)moveToLevel:(uint8_t)level
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveToLevel(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime, optionMask, optionOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToLevel(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime, optionMask, optionOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToLevelWithOnOff:(uint8_t)level
-              transitionTime:(uint16_t)transitionTime
-           completionHandler:(ResponseHandler)completionHandler
+- (void)moveToLevelWithOnOff:(uint8_t)level transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5819,12 +5484,7 @@ - (void)moveWithOnOff:(uint8_t)moveMode rate:(uint8_t)rate completionHandler:(Re
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)step:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)step:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5839,18 +5499,14 @@ - (void)step:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.Step(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
+    CHIP_ERROR err = self.cppCluster.Step(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepWithOnOff:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepWithOnOff:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5940,10 +5596,7 @@ - (void)readAttributeCurrentLevel:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentLevel:(uint16_t)minInterval
-                           maxInterval:(uint16_t)maxInterval
-                                change:(uint8_t)change
-                     completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentLevel:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5958,8 +5611,8 @@ - (void)configureAttributeCurrentLevel:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentLevel(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5967,7 +5620,7 @@ - (void)configureAttributeCurrentLevel:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentLevel:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentLevel:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -6005,8 +5658,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPLowPower ()
 @property (readonly) Controller::LowPowerCluster cppCluster;
 @end
@@ -6064,8 +5719,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPOnOff ()
 @property (readonly) Controller::OnOffCluster cppCluster;
 @end
@@ -6146,8 +5803,7 @@ - (void)toggle:(ResponseHandler)completionHandler
 
 - (void)readAttributeOnOff:(ResponseHandler)completionHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onSuccess
-        = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPBooleanAttributeCallbackBridge * onSuccess = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6168,9 +5824,7 @@ - (void)readAttributeOnOff:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeOnOff:(uint16_t)minInterval
-                    maxInterval:(uint16_t)maxInterval
-              completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeOnOff:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -6185,6 +5839,7 @@ - (void)configureAttributeOnOff:(uint16_t)minInterval
         return;
     }
 
+
     CHIP_ERROR err = self.cppCluster.ConfigureAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
@@ -6193,10 +5848,9 @@ - (void)configureAttributeOnOff:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeOnOff:(ResponseHandler)reportHandler
+- (void) reportAttributeOnOff:(ResponseHandler)reportHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onReport
-        = new CHIPBooleanAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
+    CHIPBooleanAttributeCallbackBridge * onReport = new CHIPBooleanAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
         reportHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6232,8 +5886,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPScenes ()
 @property (readonly) Controller::ScenesCluster cppCluster;
 @end
@@ -6245,17 +5901,9 @@ @implementation CHIPScenes
     return &_cppCluster;
 }
 
-- (void)addScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-            sceneName:(NSString *)sceneName
-            clusterId:(uint16_t)clusterId
-               length:(uint8_t)length
-                value:(uint8_t)value
-    completionHandler:(ResponseHandler)completionHandler
+- (void)addScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime sceneName:(NSString *)sceneName clusterId:(uint16_t)clusterId length:(uint8_t)length value:(uint8_t)value completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterAddSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterAddSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterAddSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterAddSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6268,10 +5916,7 @@ - (void)addScene:(uint16_t)groupId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime,
-        chip::ByteSpan((const uint8_t *) [sceneName dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [sceneName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]),
-        clusterId, length, value);
+    CHIP_ERROR err = self.cppCluster.AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime, chip::ByteSpan((const uint8_t*)[sceneName dataUsingEncoding:NSUTF8StringEncoding].bytes, [sceneName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]), clusterId, length, value);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -6280,8 +5925,7 @@ - (void)addScene:(uint16_t)groupId
 }
 - (void)getSceneMembership:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * onSuccess = new CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6301,10 +5945,7 @@ - (void)getSceneMembership:(uint16_t)groupId completionHandler:(ResponseHandler)
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)recallScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler
+- (void)recallScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -6328,8 +5969,7 @@ - (void)recallScene:(uint16_t)groupId
 }
 - (void)removeAllScenes:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * onSuccess = new CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6351,8 +5991,7 @@ - (void)removeAllScenes:(uint16_t)groupId completionHandler:(ResponseHandler)com
 }
 - (void)removeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterRemoveSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterRemoveSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterRemoveSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterRemoveSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6374,8 +6013,7 @@ - (void)removeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler
 }
 - (void)storeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterStoreSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterStoreSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterStoreSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterStoreSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6397,8 +6035,7 @@ - (void)storeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:
 }
 - (void)viewScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterViewSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterViewSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterViewSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterViewSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6490,8 +6127,7 @@ - (void)readAttributeCurrentGroup:(ResponseHandler)completionHandler
 
 - (void)readAttributeSceneValid:(ResponseHandler)completionHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onSuccess
-        = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPBooleanAttributeCallbackBridge * onSuccess = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6558,8 +6194,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPTemperatureMeasurement ()
 @property (readonly) Controller::TemperatureMeasurementCluster cppCluster;
 @end
@@ -6571,6 +6209,7 @@ @implementation CHIPTemperatureMeasurement
     return &_cppCluster;
 }
 
+
 - (void)readAttributeMeasuredValue:(ResponseHandler)completionHandler
 {
     CHIPInt16sAttributeCallbackBridge * onSuccess = new CHIPInt16sAttributeCallbackBridge(completionHandler, [self callbackQueue]);
@@ -6594,10 +6233,7 @@ - (void)readAttributeMeasuredValue:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeMeasuredValue:(uint16_t)minInterval
-                            maxInterval:(uint16_t)maxInterval
-                                 change:(int16_t)change
-                      completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeMeasuredValue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(int16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -6612,8 +6248,8 @@ - (void)configureAttributeMeasuredValue:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeMeasuredValue(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -6621,7 +6257,7 @@ - (void)configureAttributeMeasuredValue:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeMeasuredValue:(ResponseHandler)reportHandler
+- (void) reportAttributeMeasuredValue:(ResponseHandler)reportHandler
 {
     CHIPInt16sAttributeCallbackBridge * onReport = new CHIPInt16sAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -6705,4 +6341,6 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
+
diff --git a/examples/chip-tool/gen/IMClusterCommandHandler.cpp b/examples/chip-tool/gen/IMClusterCommandHandler.cpp
index 8398b130687fdc..6ff41e78a53824 100644
--- a/examples/chip-tool/gen/IMClusterCommandHandler.cpp
+++ b/examples/chip-tool/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,1929 +47,1880 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_CLEAR_ALL_PINS_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearAllPinsResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllPinsResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearPinResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearPinResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearRfidResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearRfidResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint8_t status;
-            bool statusExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists = false;
-            uint8_t operatingModeDuringHoliday;
-            bool operatingModeDuringHolidayExists = false;
-            uint32_t validArgumentCount           = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (operatingModeDuringHolidayExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operatingModeDuringHolidayExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime,
-                                                                         operatingModeDuringHoliday);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint8_t status;
+bool statusExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint8_t operatingModeDuringHoliday;
+bool operatingModeDuringHolidayExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (operatingModeDuringHolidayExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operatingModeDuringHolidayExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t logEntryId;
-            bool logEntryIdExists = false;
-            uint32_t timestamp;
-            bool timestampExists = false;
-            uint8_t eventType;
-            bool eventTypeExists = false;
-            uint8_t source;
-            bool sourceExists = false;
-            uint8_t eventIdOrAlarmCode;
-            bool eventIdOrAlarmCodeExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (logEntryIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(logEntryId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        logEntryIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (timestampExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timestamp);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timestampExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (eventTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(eventType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        eventTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (sourceExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(source);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sourceExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (eventIdOrAlarmCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(eventIdOrAlarmCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        eventIdOrAlarmCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode,
-                                                                   userId, const_cast<uint8_t *>(pin));
-            }
-            else if (7 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t logEntryId;
+bool logEntryIdExists = false;
+uint32_t timestamp;
+bool timestampExists = false;
+uint8_t eventType;
+bool eventTypeExists = false;
+uint8_t source;
+bool sourceExists = false;
+uint8_t eventIdOrAlarmCode;
+bool eventIdOrAlarmCodeExists = false;
+uint16_t userId;
+bool userIdExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (logEntryIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(logEntryId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            logEntryIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (timestampExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timestamp);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timestampExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (eventTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(eventType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            eventTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (sourceExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(source);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sourceExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (eventIdOrAlarmCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(eventIdOrAlarmCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            eventIdOrAlarmCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, const_cast<uint8_t*>(pin));
+        }
+else if (7 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_PIN_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, const_cast<uint8_t *>(pin));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, const_cast<uint8_t*>(pin));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_RFID_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * rfid;
-            bool rfidExists             = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (rfidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(rfid);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rfidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, const_cast<uint8_t *>(rfid));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * rfid;
+bool rfidExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (rfidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(rfid);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rfidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, const_cast<uint8_t*>(rfid));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userType;
-            bool userTypeExists         = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t status;
-            bool statusExists = false;
-            uint8_t daysMask;
-            bool daysMaskExists = false;
-            uint8_t startHour;
-            bool startHourExists = false;
-            uint8_t startMinute;
-            bool startMinuteExists = false;
-            uint8_t endHour;
-            bool endHourExists = false;
-            uint8_t endMinute;
-            bool endMinuteExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (daysMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(daysMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        daysMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (startHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (startMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (endHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 7:
-                    if (endMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour,
-                                                                         startMinute, endHour, endMinute);
-            }
-            else if (8 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 8,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t status;
+bool statusExists = false;
+uint8_t daysMask;
+bool daysMaskExists = false;
+uint8_t startHour;
+bool startHourExists = false;
+uint8_t startMinute;
+bool startMinuteExists = false;
+uint8_t endHour;
+bool endHourExists = false;
+uint8_t endMinute;
+bool endMinuteExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (daysMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(daysMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            daysMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (startHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (startMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (endHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 7:
+      if (endMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, startMinute, endHour, endMinute);
+        }
+else if (8 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 8, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t status;
-            bool statusExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists     = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t status;
+bool statusExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterLockDoorResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterLockDoorResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_PIN_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetPinResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetPinResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_RFID_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetRfidResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetRfidResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetUserTypeResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetUserTypeResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
-        case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockDoorResponseCallback(status);
         }
-        case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockDoorResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         default: {
@@ -1982,7 +1933,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace DoorLock
+}
 
 namespace GeneralCommissioning {
 
@@ -1992,247 +1943,240 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t errorCode;
-            bool errorCodeExists = false;
-            const uint8_t * debugText;
-            bool debugTextExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (errorCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(errorCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        errorCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (debugTextExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(debugText);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        debugTextExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, const_cast<uint8_t *>(debugText));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t errorCode;
+bool errorCodeExists = false;
+const uint8_t * debugText;
+bool debugTextExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (errorCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(errorCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            errorCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (debugTextExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(debugText);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            debugTextExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, const_cast<uint8_t*>(debugText));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t errorCode;
-            bool errorCodeExists = false;
-            const uint8_t * debugText;
-            bool debugTextExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (errorCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(errorCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        errorCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (debugTextExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(debugText);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        debugTextExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode,
-                                                                                        const_cast<uint8_t *>(debugText));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t errorCode;
+bool errorCodeExists = false;
+const uint8_t * debugText;
+bool debugTextExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (errorCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(errorCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            errorCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (debugTextExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(debugText);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            debugTextExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, const_cast<uint8_t*>(debugText));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_FABRIC_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t errorCode;
-            bool errorCodeExists = false;
-            const uint8_t * debugText;
-            bool debugTextExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (errorCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(errorCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        errorCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (debugTextExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(debugText);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        debugTextExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, const_cast<uint8_t *>(debugText));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t errorCode;
+bool errorCodeExists = false;
+const uint8_t * debugText;
+bool debugTextExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (errorCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(errorCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            errorCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (debugTextExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(debugText);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            debugTextExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, const_cast<uint8_t*>(debugText));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         default: {
@@ -2245,7 +2189,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace GeneralCommissioning
+}
 
 namespace Groups {
 
@@ -2255,357 +2199,349 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_GROUP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t capacity;
-            bool capacityExists = false;
-            uint8_t groupCount;
-            bool groupCountExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
-            bool groupListExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (capacityExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(capacity);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        capacityExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupCountExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupCount);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupCountExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (groupListExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupListExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t capacity;
+bool capacityExists = false;
+uint8_t groupCount;
+bool groupCountExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
+bool groupListExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (capacityExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(capacity);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            capacityExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupCountExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupCount);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupCountExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (groupListExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupListExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            const uint8_t * groupName;
-            bool groupNameExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (groupNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(groupName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterViewGroupResponseCallback(status, groupId, const_cast<uint8_t *>(groupName));
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+const uint8_t * groupName;
+bool groupNameExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (groupNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(groupName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterViewGroupResponseCallback(status, groupId, const_cast<uint8_t*>(groupName));
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         default: {
@@ -2618,7 +2554,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Groups
+}
 
 namespace Identify {
 
@@ -2628,67 +2564,65 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t timeout;
-            bool timeoutExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeout);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t timeout;
+bool timeoutExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeout);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         default: {
@@ -2701,7 +2635,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Identify
+}
 
 namespace Scenes {
 
@@ -2711,647 +2645,634 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint8_t capacity;
-            bool capacityExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneCount;
-            bool sceneCountExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList;
-            bool sceneListExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (capacityExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(capacity);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        capacityExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (sceneCountExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneCount);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneCountExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (sceneListExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(sceneList));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneListExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint8_t capacity;
+bool capacityExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneCount;
+bool sceneCountExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  sceneList;
+bool sceneListExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (capacityExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(capacity);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            capacityExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (sceneCountExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneCount);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneCountExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (sceneListExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(sceneList));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneListExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_STORE_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            const uint8_t * sceneName;
-            bool sceneNameExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-            bool extensionFieldSetsExists = false;
-            uint32_t validArgumentCount   = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (sceneNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(sceneName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (extensionFieldSetsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        extensionFieldSetsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime,
-                                                              const_cast<uint8_t *>(sceneName), extensionFieldSets);
-            }
-            else if (6 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+const uint8_t * sceneName;
+bool sceneNameExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+bool extensionFieldSetsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (sceneNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(sceneName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (extensionFieldSetsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            extensionFieldSetsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, const_cast<uint8_t*>(sceneName), extensionFieldSets);
+        }
+else if (6 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6, validArgumentCount);
+}
             break;
         }
         default: {
@@ -3364,15 +3285,16 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Scenes
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
diff --git a/examples/chip-tool/gen/af-structs.h b/examples/chip-tool/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/examples/chip-tool/gen/af-structs.h
+++ b/examples/chip-tool/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/examples/chip-tool/gen/attribute-id.h b/examples/chip-tool/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/examples/chip-tool/gen/attribute-id.h
+++ b/examples/chip-tool/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/examples/chip-tool/gen/attribute-size.h b/examples/chip-tool/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/examples/chip-tool/gen/attribute-size.h
+++ b/examples/chip-tool/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/examples/chip-tool/gen/attribute-type.h b/examples/chip-tool/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/examples/chip-tool/gen/attribute-type.h
+++ b/examples/chip-tool/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/examples/chip-tool/gen/call-command-handler.cpp b/examples/chip-tool/gen/call-command-handler.cpp
index 66538a88f18d42..b78ae9cdbd17f5 100644
--- a/examples/chip-tool/gen/call-command-handler.cpp
+++ b/examples/chip-tool/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -43,6 +43,7 @@ EmberAfStatus emberAfOnOffClusterClientCommandParse(EmberAfClusterCommand * cmd)
 EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfTemperatureMeasurementClusterClientCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -63,6 +64,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -72,54 +74,54 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+        case ZCL_APPLICATION_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Application Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+        case ZCL_BARRIER_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Barrier Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BINDING_CLUSTER_ID:
+        case ZCL_BINDING_CLUSTER_ID :
             // No commands are enabled for cluster Binding
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_COLOR_CONTROL_CLUSTER_ID:
+        case ZCL_COLOR_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Color Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_DOOR_LOCK_CLUSTER_ID:
+        case ZCL_DOOR_LOCK_CLUSTER_ID :
             result = emberAfDoorLockClusterClientCommandParse(cmd);
             break;
-        case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+        case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID :
             result = emberAfGeneralCommissioningClusterClientCommandParse(cmd);
             break;
-        case ZCL_GROUPS_CLUSTER_ID:
+        case ZCL_GROUPS_CLUSTER_ID :
             result = emberAfGroupsClusterClientCommandParse(cmd);
             break;
-        case ZCL_IDENTIFY_CLUSTER_ID:
+        case ZCL_IDENTIFY_CLUSTER_ID :
             result = emberAfIdentifyClusterClientCommandParse(cmd);
             break;
-        case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        case ZCL_LEVEL_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Level Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_LOW_POWER_CLUSTER_ID:
+        case ZCL_LOW_POWER_CLUSTER_ID :
             // No commands are enabled for cluster Low Power
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_ON_OFF_CLUSTER_ID:
+        case ZCL_ON_OFF_CLUSTER_ID :
             // No commands are enabled for cluster On/off
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_SCENES_CLUSTER_ID:
+        case ZCL_SCENES_CLUSTER_ID :
             result = emberAfScenesClusterClientCommandParse(cmd);
             break;
-        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
             // No commands are enabled for cluster Temperature Measurement
             result = status(false, true, cmd->mfgSpecific);
             break;
@@ -152,502 +154,498 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_CLEAR_ALL_PINS_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearPinResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearPinResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
             break;
         }
         case ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint8_t status;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-            uint8_t operatingModeDuringHoliday;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime  = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime,
-                                                                                  operatingModeDuringHoliday);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint8_t status;
+uint32_t localStartTime;
+uint32_t localEndTime;
+uint8_t operatingModeDuringHoliday;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday);
             break;
         }
         case ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t logEntryId;
-            uint32_t timestamp;
-            uint8_t eventType;
-            uint8_t source;
-            uint8_t eventIdOrAlarmCode;
-            uint16_t userId;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            logEntryId    = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timestamp     = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            eventType     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            source        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            eventIdOrAlarmCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset      = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source,
-                                                                            eventIdOrAlarmCode, userId, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t logEntryId;
+uint32_t timestamp;
+uint8_t eventType;
+uint8_t source;
+uint8_t eventIdOrAlarmCode;
+uint16_t userId;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  logEntryId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timestamp = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  eventType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  source = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  eventIdOrAlarmCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin);
             break;
         }
         case ZCL_GET_PIN_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, pin);
             break;
         }
         case ZCL_GET_RFID_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * rfid;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rfid = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, rfid);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * rfid;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rfid = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, rfid);
             break;
         }
         case ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userType;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userType;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
             break;
         }
         case ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint8_t status;
-            uint8_t daysMask;
-            uint8_t startHour;
-            uint8_t startMinute;
-            uint8_t endHour;
-            uint8_t endMinute;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            daysMask      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startHour     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startMinute   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endHour       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour,
-                                                                                  startMinute, endHour, endMinute);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint8_t status;
+uint8_t daysMask;
+uint8_t startHour;
+uint8_t startMinute;
+uint8_t endHour;
+uint8_t endMinute;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  daysMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, startMinute, endHour, endMinute);
             break;
         }
         case ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint8_t status;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint8_t status;
+uint32_t localStartTime;
+uint32_t localEndTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
             break;
         }
         case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status);
             break;
         }
         case ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
             break;
         }
         case ZCL_SET_PIN_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetPinResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetPinResponseCallback(status);
             break;
         }
         case ZCL_SET_RFID_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(status);
             break;
         }
         case ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(status);
             break;
         }
         case ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
             break;
         }
         case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
             break;
         }
         case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status);
             break;
         }
         case ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
             break;
         }
         default: {
@@ -667,63 +665,63 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t errorCode;
-            uint8_t * debugText;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            errorCode     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, debugText);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t errorCode;
+uint8_t * debugText;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  errorCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, debugText);
             break;
         }
         case ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t errorCode;
-            uint8_t * debugText;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            errorCode     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, debugText);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t errorCode;
+uint8_t * debugText;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  errorCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, debugText);
             break;
         }
         case ZCL_SET_FABRIC_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t errorCode;
-            uint8_t * debugText;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            errorCode     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t errorCode;
+uint8_t * debugText;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  errorCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText);
             break;
         }
         default: {
@@ -743,93 +741,93 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_GROUP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
             break;
         }
         case ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t capacity;
-            uint8_t groupCount;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            capacity      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupCount    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            groupList     = cmd->buffer + payloadOffset;
-
-            wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t capacity;
+uint8_t groupCount;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  capacity = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupCount = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    groupList = cmd->buffer + payloadOffset;
+
+wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
             break;
         }
         case ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
             break;
         }
         case ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t * groupName;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterViewGroupResponseCallback(status, groupId, groupName);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t * groupName;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterViewGroupResponseCallback(status, groupId, groupName);
             break;
         }
         default: {
@@ -849,16 +847,16 @@ EmberAfStatus emberAfIdentifyClusterClientCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t timeout;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t timeout;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
             break;
         }
         default: {
@@ -878,221 +876,220 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint8_t capacity;
-            uint16_t groupId;
-            uint8_t sceneCount;
-            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            capacity      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (status == 0)
-            {
-                if (cmd->bufLen < payloadOffset + 1)
-                {
-                    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-                }
-                sceneCount    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-                payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            }
-            else
-            {
-                sceneCount = UINT8_MAX;
-            }
-            if (status == 0)
-            {
-                sceneList = cmd->buffer + payloadOffset;
-            }
-            else
-            {
-                sceneList = NULL;
-            }
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint8_t capacity;
+uint16_t groupId;
+uint8_t sceneCount;
+/* TYPE WARNING: array array defaults to */ uint8_t *  sceneList;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  capacity = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+  if (status==0)
+{
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneCount = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+  }
+else
+{
+  sceneCount = UINT8_MAX;
+}
+if (status==0)
+{
+  sceneList = cmd->buffer + payloadOffset;
+}
+else
+{
+  sceneList = NULL;
+}
 
-            wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
+wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
             break;
         }
         case ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
             break;
         }
         case ZCL_STORE_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
             break;
         }
         case ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-            uint16_t transitionTime;
-            uint8_t * sceneName;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (status == 0)
-            {
-                if (cmd->bufLen < payloadOffset + 2)
-                {
-                    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-                }
-                transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-                payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            }
-            else
-            {
-                transitionTime = UINT16_MAX;
-            }
-            if (status == 0)
-            {
-                if (cmd->bufLen < payloadOffset + 1u)
-                {
-                    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-                }
-                sceneName     = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                payloadOffset = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
-            }
-            else
-            {
-                sceneName = NULL;
-            }
-            if (status == 0)
-            {
-                extensionFieldSets = cmd->buffer + payloadOffset;
-            }
-            else
-            {
-                extensionFieldSets = NULL;
-            }
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+uint16_t transitionTime;
+uint8_t * sceneName;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+  if (status==0)
+{
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+  }
+else
+{
+  transitionTime = UINT16_MAX;
+}
+if (status==0)
+{
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
+}
+else
+{
+  sceneName = NULL;
+}
+if (status==0)
+{
+  extensionFieldSets = cmd->buffer + payloadOffset;
+}
+else
+{
+  extensionFieldSets = NULL;
+}
 
-            wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName,
-                                                                       extensionFieldSets);
+wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
             break;
         }
         default: {
diff --git a/examples/chip-tool/gen/callback-stub.cpp b/examples/chip-tool/gen/callback-stub.cpp
index 2e044efde235ed..a549e2e30c66c8 100644
--- a/examples/chip-tool/gen/callback-stub.cpp
+++ b/examples/chip-tool/gen/callback-stub.cpp
@@ -29,46 +29,46 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+     case ZCL_APPLICATION_BASIC_CLUSTER_ID :
         emberAfApplicationBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+     case ZCL_BARRIER_CONTROL_CLUSTER_ID :
         emberAfBarrierControlClusterInitCallback(endpoint);
         break;
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_BINDING_CLUSTER_ID:
+     case ZCL_BINDING_CLUSTER_ID :
         emberAfBindingClusterInitCallback(endpoint);
         break;
-    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+     case ZCL_COLOR_CONTROL_CLUSTER_ID :
         emberAfColorControlClusterInitCallback(endpoint);
         break;
-    case ZCL_DOOR_LOCK_CLUSTER_ID:
+     case ZCL_DOOR_LOCK_CLUSTER_ID :
         emberAfDoorLockClusterInitCallback(endpoint);
         break;
-    case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+     case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID :
         emberAfGeneralCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_GROUPS_CLUSTER_ID:
+     case ZCL_GROUPS_CLUSTER_ID :
         emberAfGroupsClusterInitCallback(endpoint);
         break;
-    case ZCL_IDENTIFY_CLUSTER_ID:
+     case ZCL_IDENTIFY_CLUSTER_ID :
         emberAfIdentifyClusterInitCallback(endpoint);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+     case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
-    case ZCL_LOW_POWER_CLUSTER_ID:
+     case ZCL_LOW_POWER_CLUSTER_ID :
         emberAfLowPowerClusterInitCallback(endpoint);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+     case ZCL_ON_OFF_CLUSTER_ID :
         emberAfOnOffClusterInitCallback(endpoint);
         break;
-    case ZCL_SCENES_CLUSTER_ID:
+     case ZCL_SCENES_CLUSTER_ID :
         emberAfScenesClusterInitCallback(endpoint);
         break;
-    case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+     case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
         emberAfTemperatureMeasurementClusterInitCallback(endpoint);
         break;
     default:
@@ -212,9 +212,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -229,8 +230,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -245,8 +247,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -263,7 +266,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -280,7 +284,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -297,7 +302,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -322,8 +328,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -342,9 +349,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -363,9 +370,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -383,7 +390,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -407,7 +415,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -430,9 +439,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -454,9 +464,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -476,10 +487,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -492,7 +505,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -533,9 +547,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -551,7 +566,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -602,9 +618,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -620,7 +637,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -656,8 +674,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -692,8 +711,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/examples/chip-tool/gen/callback.h b/examples/chip-tool/gen/callback.h
index 0de9f0dd4cae33..a8058f1e612420 100644
--- a/examples/chip-tool/gen/callback.h
+++ b/examples/chip-tool/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Application Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Barrier Control Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -63,6 +66,7 @@ void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Binding Cluster Init
  *
  * Cluster Init
@@ -71,6 +75,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBindingClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Color Control Cluster Init
  *
  * Cluster Init
@@ -79,6 +84,7 @@ void emberAfBindingClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Door Lock Cluster Init
  *
  * Cluster Init
@@ -87,6 +93,7 @@ void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief General Commissioning Cluster Init
  *
  * Cluster Init
@@ -95,6 +102,7 @@ void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGeneralCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Groups Cluster Init
  *
  * Cluster Init
@@ -103,6 +111,7 @@ void emberAfGeneralCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Identify Cluster Init
  *
  * Cluster Init
@@ -111,6 +120,7 @@ void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Level Control Cluster Init
  *
  * Cluster Init
@@ -119,6 +129,7 @@ void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Low Power Cluster Init
  *
  * Cluster Init
@@ -127,6 +138,7 @@ void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief On/off Cluster Init
  *
  * Cluster Init
@@ -135,6 +147,7 @@ void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Scenes Cluster Init
  *
  * Cluster Init
@@ -143,6 +156,7 @@ void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Temperature Measurement Cluster Init
  *
  * Cluster Init
@@ -151,8 +165,10 @@ void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfTemperatureMeasurementClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Application Basic Cluster client
 //
@@ -182,9 +198,7 @@ void emberAfApplicationBasicClusterClientAttributeChangedCallback(chip::Endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                      chip::AttributeId attributeId,
-                                                                                      uint16_t manufacturerCode);
+void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Application Basic Cluster Client Message Sent
  *
@@ -197,9 +211,7 @@ void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCal
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                             EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                             EmberStatus status);
+void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Application Basic Cluster Client Pre Attribute Changed
  *
@@ -211,10 +223,7 @@ void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessag
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfApplicationBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              EmberAfAttributeType attributeType, uint8_t size,
-                                                                              uint8_t * value);
+EmberAfStatus emberAfApplicationBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Application Basic Cluster Client Tick
  *
@@ -253,9 +262,7 @@ void emberAfBarrierControlClusterClientAttributeChangedCallback(chip::EndpointId
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    uint16_t manufacturerCode);
+void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Barrier Control Cluster Client Message Sent
  *
@@ -268,9 +275,7 @@ void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallb
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                           EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                           EmberStatus status);
+void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Barrier Control Cluster Client Pre Attribute Changed
  *
@@ -282,10 +287,7 @@ void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageT
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBarrierControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            EmberAfAttributeType attributeType, uint8_t size,
-                                                                            uint8_t * value);
+EmberAfStatus emberAfBarrierControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Barrier Control Cluster Client Tick
  *
@@ -324,8 +326,7 @@ void emberAfBasicClusterClientAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Client Message Sent
  *
@@ -338,8 +339,7 @@ void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Client Pre Attribute Changed
  *
@@ -351,9 +351,7 @@ void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Client Tick
  *
@@ -392,9 +390,7 @@ void emberAfBindingClusterClientAttributeChangedCallback(chip::EndpointId endpoi
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                             chip::AttributeId attributeId,
-                                                                             uint16_t manufacturerCode);
+void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Binding Cluster Client Message Sent
  *
@@ -407,9 +403,7 @@ void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chi
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                    EmberStatus status);
+void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Binding Cluster Client Pre Attribute Changed
  *
@@ -421,9 +415,7 @@ void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType typ
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBindingClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                     EmberAfAttributeType attributeType, uint8_t size,
-                                                                     uint8_t * value);
+EmberAfStatus emberAfBindingClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Binding Cluster Client Tick
  *
@@ -462,9 +454,7 @@ void emberAfColorControlClusterClientAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Color Control Cluster Client Message Sent
  *
@@ -477,9 +467,7 @@ void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Color Control Cluster Client Pre Attribute Changed
  *
@@ -491,9 +479,7 @@ void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfColorControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfColorControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Color Control Cluster Client Tick
  *
@@ -532,9 +518,7 @@ void emberAfDoorLockClusterClientAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Door Lock Cluster Client Message Sent
  *
@@ -547,9 +531,7 @@ void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Door Lock Cluster Client Pre Attribute Changed
  *
@@ -561,9 +543,7 @@ void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfDoorLockClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfDoorLockClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Door Lock Cluster Client Tick
  *
@@ -602,9 +582,7 @@ void emberAfGeneralCommissioningClusterClientAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief General Commissioning Cluster Client Message Sent
  *
@@ -617,9 +595,7 @@ void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief General Commissioning Cluster Client Pre Attribute Changed
  *
@@ -631,10 +607,7 @@ void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGeneralCommissioningClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfGeneralCommissioningClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief General Commissioning Cluster Client Tick
  *
@@ -673,9 +646,7 @@ void emberAfGroupsClusterClientAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Groups Cluster Client Message Sent
  *
@@ -688,9 +659,7 @@ void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Groups Cluster Client Pre Attribute Changed
  *
@@ -702,9 +671,7 @@ void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGroupsClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfGroupsClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Groups Cluster Client Tick
  *
@@ -743,9 +710,7 @@ void emberAfIdentifyClusterClientAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Identify Cluster Client Message Sent
  *
@@ -758,9 +723,7 @@ void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Identify Cluster Client Pre Attribute Changed
  *
@@ -772,9 +735,7 @@ void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfIdentifyClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfIdentifyClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Identify Cluster Client Tick
  *
@@ -813,9 +774,7 @@ void emberAfLevelControlClusterClientAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Level Control Cluster Client Message Sent
  *
@@ -828,9 +787,7 @@ void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Level Control Cluster Client Pre Attribute Changed
  *
@@ -842,9 +799,7 @@ void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLevelControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfLevelControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Level Control Cluster Client Tick
  *
@@ -883,9 +838,7 @@ void emberAfLowPowerClusterClientAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Low Power Cluster Client Message Sent
  *
@@ -898,9 +851,7 @@ void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Low Power Cluster Client Pre Attribute Changed
  *
@@ -912,9 +863,7 @@ void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLowPowerClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfLowPowerClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Low Power Cluster Client Tick
  *
@@ -953,8 +902,7 @@ void emberAfOnOffClusterClientAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief On/off Cluster Client Message Sent
  *
@@ -967,8 +915,7 @@ void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief On/off Cluster Client Pre Attribute Changed
  *
@@ -980,9 +927,7 @@ void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfOnOffClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfOnOffClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief On/off Cluster Client Tick
  *
@@ -1021,9 +966,7 @@ void emberAfScenesClusterClientAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Scenes Cluster Client Message Sent
  *
@@ -1036,9 +979,7 @@ void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Scenes Cluster Client Pre Attribute Changed
  *
@@ -1050,9 +991,7 @@ void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfScenesClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfScenesClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Scenes Cluster Client Tick
  *
@@ -1091,9 +1030,7 @@ void emberAfTemperatureMeasurementClusterClientAttributeChangedCallback(chip::En
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                            chip::AttributeId attributeId,
-                                                                                            uint16_t manufacturerCode);
+void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Temperature Measurement Cluster Client Message Sent
  *
@@ -1106,9 +1043,7 @@ void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChan
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                   EmberStatus status);
+void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Temperature Measurement Cluster Client Pre Attribute Changed
  *
@@ -1120,10 +1055,7 @@ void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoing
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfTemperatureMeasurementClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    EmberAfAttributeType attributeType,
-                                                                                    uint8_t size, uint8_t * value);
+EmberAfStatus emberAfTemperatureMeasurementClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Temperature Measurement Cluster Client Tick
  *
@@ -1136,325 +1068,317 @@ void emberAfTemperatureMeasurementClusterClientTickCallback(chip::EndpointId end
 // Cluster Commands Callback
 
 /**
- * @brief Door Lock Cluster ClearAllPinsResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearAllPinsResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearAllRfidsResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearAllRfidsResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearPinResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearPinResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearRfidResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearRfidResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback
- * @param scheduleId
- * @param status
- * @param localStartTime
- * @param localEndTime
- * @param operatingModeDuringHoliday
- */
+* @brief Door Lock Cluster GetHolidayScheduleResponse Command callback
+* @param scheduleId
+* @param status
+* @param localStartTime
+* @param localEndTime
+* @param operatingModeDuringHoliday
+*/
 
-bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime,
-                                                              uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
+bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
 
 /**
- * @brief Door Lock Cluster GetLogRecordResponse Command callback
- * @param logEntryId
- * @param timestamp
- * @param eventType
- * @param source
- * @param eventIdOrAlarmCode
- * @param userId
- * @param pin
- */
-
-bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-                                                        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin);
+* @brief Door Lock Cluster GetLogRecordResponse Command callback
+* @param logEntryId
+* @param timestamp
+* @param eventType
+* @param source
+* @param eventIdOrAlarmCode
+* @param userId
+* @param pin
+*/
+
+bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin);
 
 /**
- * @brief Door Lock Cluster GetPinResponse Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param pin
- */
+* @brief Door Lock Cluster GetPinResponse Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param pin
+*/
 
 bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin);
 
 /**
- * @brief Door Lock Cluster GetRfidResponse Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param rfid
- */
+* @brief Door Lock Cluster GetRfidResponse Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param rfid
+*/
 
 bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid);
 
 /**
- * @brief Door Lock Cluster GetUserTypeResponse Command callback
- * @param userId
- * @param userType
- */
+* @brief Door Lock Cluster GetUserTypeResponse Command callback
+* @param userId
+* @param userType
+*/
 
 bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType);
 
 /**
- * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback
- * @param scheduleId
- * @param userId
- * @param status
- * @param daysMask
- * @param startHour
- * @param startMinute
- * @param endHour
- * @param endMinute
- */
-
-bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask,
-                                                              uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-                                                              uint8_t endMinute);
+* @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback
+* @param scheduleId
+* @param userId
+* @param status
+* @param daysMask
+* @param startHour
+* @param startMinute
+* @param endHour
+* @param endMinute
+*/
+
+bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
 /**
- * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback
- * @param scheduleId
- * @param userId
- * @param status
- * @param localStartTime
- * @param localEndTime
- */
+* @brief Door Lock Cluster GetYeardayScheduleResponse Command callback
+* @param scheduleId
+* @param userId
+* @param status
+* @param localStartTime
+* @param localEndTime
+*/
 
-bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status,
-                                                              uint32_t localStartTime, uint32_t localEndTime);
+bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime);
 
 /**
- * @brief Door Lock Cluster LockDoorResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster LockDoorResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetHolidayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetPinResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetPinResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetRfidResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetRfidResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetUserTypeResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetUserTypeResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetYeardayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster UnlockDoorResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster UnlockDoorResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status);
 
 /**
- * @brief General Commissioning Cluster ArmFailSafeResponse Command callback
- * @param errorCode
- * @param debugText
- */
+* @brief General Commissioning Cluster ArmFailSafeResponse Command callback
+* @param errorCode
+* @param debugText
+*/
 
 bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText);
 
 /**
- * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback
- * @param errorCode
- * @param debugText
- */
+* @brief General Commissioning Cluster CommissioningCompleteResponse Command callback
+* @param errorCode
+* @param debugText
+*/
 
 bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText);
 
 /**
- * @brief General Commissioning Cluster SetFabricResponse Command callback
- * @param errorCode
- * @param debugText
- */
+* @brief General Commissioning Cluster SetFabricResponse Command callback
+* @param errorCode
+* @param debugText
+*/
 
 bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText);
 
 /**
- * @brief Groups Cluster AddGroupResponse Command callback
- * @param status
- * @param groupId
- */
+* @brief Groups Cluster AddGroupResponse Command callback
+* @param status
+* @param groupId
+*/
 
 bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId);
 
 /**
- * @brief Groups Cluster GetGroupMembershipResponse Command callback
- * @param capacity
- * @param groupCount
- * @param groupList
- */
+* @brief Groups Cluster GetGroupMembershipResponse Command callback
+* @param capacity
+* @param groupCount
+* @param groupList
+*/
 
-bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
+bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList);
 
 /**
- * @brief Groups Cluster RemoveGroupResponse Command callback
- * @param status
- * @param groupId
- */
+* @brief Groups Cluster RemoveGroupResponse Command callback
+* @param status
+* @param groupId
+*/
 
 bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId);
 
 /**
- * @brief Groups Cluster ViewGroupResponse Command callback
- * @param status
- * @param groupId
- * @param groupName
- */
+* @brief Groups Cluster ViewGroupResponse Command callback
+* @param status
+* @param groupId
+* @param groupName
+*/
 
 bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName);
 
 /**
- * @brief Identify Cluster IdentifyQueryResponse Command callback
- * @param timeout
- */
+* @brief Identify Cluster IdentifyQueryResponse Command callback
+* @param timeout
+*/
 
 bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout);
 
 /**
- * @brief Scenes Cluster AddSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster AddSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster GetSceneMembershipResponse Command callback
- * @param status
- * @param capacity
- * @param groupId
- * @param sceneCount
- * @param sceneList
- */
+* @brief Scenes Cluster GetSceneMembershipResponse Command callback
+* @param status
+* @param capacity
+* @param groupId
+* @param sceneCount
+* @param sceneList
+*/
 
-bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList);
+bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList);
 
 /**
- * @brief Scenes Cluster RemoveAllScenesResponse Command callback
- * @param status
- * @param groupId
- */
+* @brief Scenes Cluster RemoveAllScenesResponse Command callback
+* @param status
+* @param groupId
+*/
 
 bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId);
 
 /**
- * @brief Scenes Cluster RemoveSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster RemoveSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster StoreSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster StoreSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster ViewSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- * @param transitionTime
- * @param sceneName
- * @param extensionFieldSets
- */
+* @brief Scenes Cluster ViewSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+* @param transitionTime
+* @param sceneName
+* @param extensionFieldSets
+*/
+
+bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets);
 
-bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                                   uint8_t * sceneName,
-                                                   /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
 
 //
 // Non-Cluster Related Callbacks
@@ -1612,8 +1536,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -1632,6 +1556,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -1649,6 +1574,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -1742,8 +1668,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -1902,8 +1828,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/examples/chip-tool/gen/client-command-macro.h b/examples/chip-tool/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/examples/chip-tool/gen/client-command-macro.h
+++ b/examples/chip-tool/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/examples/chip-tool/gen/cluster-id.h b/examples/chip-tool/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/examples/chip-tool/gen/cluster-id.h
+++ b/examples/chip-tool/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/examples/chip-tool/gen/command-id.h b/examples/chip-tool/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/examples/chip-tool/gen/command-id.h
+++ b/examples/chip-tool/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/examples/chip-tool/gen/endpoint_config.h b/examples/chip-tool/gen/endpoint_config.h
index 7f78df5818c6b8..7be9f5f8725a3c 100644
--- a/examples/chip-tool/gen/endpoint_config.h
+++ b/examples/chip-tool/gen/endpoint_config.h
@@ -20,133 +20,94 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (0)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT 14
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                                 \
-          ZAP_SIMPLE_DEFAULT(2) }, /* Identify (client): cluster revision */                                                       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Groups (client): cluster revision */                                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Scenes (client): cluster revision */                                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(2) }, /* On/off (client): cluster revision */                                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (client): cluster revision */                                              \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT) | ZAP_ATTRIBUTE_MASK(SINGLETON),                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (client): cluster revision */                                                      \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* General Commissioning (client): cluster revision */                                 \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (client): cluster revision */                                                  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (client): cluster revision */                                       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Color Control (client): cluster revision */                                              \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (client): cluster revision */                                    \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Low Power (client): cluster revision */                                             \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (client): cluster revision */                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Binding (client): cluster revision */                                               \
-    }
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(2) }, /* Identify (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Groups (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Scenes (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(2) }, /* On/off (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT) | ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* General Commissioning (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Color Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Low Power (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Binding (client): cluster revision */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS
+#define GENERATED_FUNCTION_ARRAYS   \
 
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT 14
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003, ZAP_ATTRIBUTE_INDEX(0), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Identify (client) */    \
-            { 0x0004, ZAP_ATTRIBUTE_INDEX(1), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Groups (client) */  \
-            { 0x0005, ZAP_ATTRIBUTE_INDEX(2), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Scenes (client) */  \
-            { 0x0006, ZAP_ATTRIBUTE_INDEX(3), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: On/off (client) */  \
-            {                                                                                                                      \
-                0x0008, ZAP_ATTRIBUTE_INDEX(4), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Level Control (client) */                                                                  \
-            { 0x0028, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Basic (client) */   \
-            {                                                                                                                      \
-                0x0030, ZAP_ATTRIBUTE_INDEX(6), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: General Commissioning (client) */                                                          \
-            {                                                                                                                      \
-                0x0101, ZAP_ATTRIBUTE_INDEX(7), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Door Lock (client) */                                                                      \
-            {                                                                                                                      \
-                0x0103, ZAP_ATTRIBUTE_INDEX(8), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Barrier Control (client) */                                                                \
-            {                                                                                                                      \
-                0x0300, ZAP_ATTRIBUTE_INDEX(9), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Color Control (client) */                                                                  \
-            {                                                                                                                      \
-                0x0402, ZAP_ATTRIBUTE_INDEX(10), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */                                                        \
-            {                                                                                                                      \
-                0x0508, ZAP_ATTRIBUTE_INDEX(11), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Low Power (client) */                                                                      \
-            {                                                                                                                      \
-                0x050D, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Application Basic (client) */                                                              \
-            {                                                                                                                      \
-                0xF000, ZAP_ATTRIBUTE_INDEX(13), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Binding (client) */                                                                        \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_CLUSTERS { \
+  { 0x0003, ZAP_ATTRIBUTE_INDEX(0), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Identify (client) */ \
+  { 0x0004, ZAP_ATTRIBUTE_INDEX(1), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Groups (client) */ \
+  { 0x0005, ZAP_ATTRIBUTE_INDEX(2), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Scenes (client) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(3), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: On/off (client) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(4), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Level Control (client) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Basic (client) */ \
+  { 0x0030, ZAP_ATTRIBUTE_INDEX(6), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: General Commissioning (client) */ \
+  { 0x0101, ZAP_ATTRIBUTE_INDEX(7), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Door Lock (client) */ \
+  { 0x0103, ZAP_ATTRIBUTE_INDEX(8), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Barrier Control (client) */ \
+  { 0x0300, ZAP_ATTRIBUTE_INDEX(9), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Color Control (client) */ \
+  { 0x0402, ZAP_ATTRIBUTE_INDEX(10), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \
+  { 0x0508, ZAP_ATTRIBUTE_INDEX(11), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Low Power (client) */ \
+  { 0x050D, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Application Basic (client) */ \
+  { 0xF000, ZAP_ATTRIBUTE_INDEX(13), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Binding (client) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 14, 28 },                                                                                          \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 14, 28 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (3)
@@ -162,274 +123,168 @@
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0001                                                                                                                     \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0001 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0103                                                                                                                     \
-    }
+#define FIXED_PROFILE_IDS { 0x0103 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_DEVICE_IDS { 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1                                                                                                                          \
-    }
+#define FIXED_DEVICE_VERSIONS { 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_ENDPOINT_TYPES { 0 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_NETWORKS { 0 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (114)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) },     /* Identify (client): Identify */                                 \
-            { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (client): IdentifyQueryResponse */                    \
-            { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (client): IdentifyQuery */                            \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroup */                                   \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): AddGroupResponse */                           \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): ViewGroup */                                  \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): ViewGroupResponse */                          \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): GetGroupMembership */                         \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): GetGroupMembershipResponse */                 \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveGroup */                                \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): RemoveGroupResponse */                        \
-            { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveAllGroups */                            \
-            { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroupIfIdentifying */                      \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): AddScene */                                   \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): AddSceneResponse */                           \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): ViewScene */                                  \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): ViewSceneResponse */                          \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveScene */                                \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveSceneResponse */                        \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveAllScenes */                            \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveAllScenesResponse */                    \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): StoreScene */                                 \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): StoreSceneResponse */                         \
-            { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RecallScene */                                \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): GetSceneMembership */                         \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): GetSceneMembershipResponse */                 \
-            { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Off */                                        \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): On */                                         \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Toggle */                                     \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevel */                         \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Move */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Step */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Stop */                                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StepWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StopWithOnOff */                       \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Basic (client): MfgSpecificPing */                             \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): Leave */                                       \
-            { 0x0030, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): SetFabric */                   \
-            { 0x0030, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): SetFabricResponse */           \
-            { 0x0030, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): ArmFailSafe */                 \
-            { 0x0030, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): ArmFailSafeResponse */         \
-            { 0x0030, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): CommissioningComplete */       \
-            { 0x0030, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): CommissioningCompleteResponse */             \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): LockDoor */                                \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): LockDoorResponse */                        \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): UnlockDoor */                              \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): UnlockDoorResponse */                      \
-            { 0x0101, 0x03,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeout */ \
-            {                                                                                                                      \
-                0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): UnlockWithTimeoutResponse */                                                                 \
-            { 0x0101, 0x04,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecord */      \
-            {                                                                                                                      \
-                0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetLogRecordResponse */                                                                      \
-            { 0x0101, 0x05,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPin */            \
-            { 0x0101, 0x05,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPinResponse */    \
-            { 0x0101, 0x06,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPin */            \
-            { 0x0101, 0x06,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPinResponse */    \
-            { 0x0101, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPin */          \
-            { 0x0101, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPinResponse */  \
-            { 0x0101, 0x08,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPins */      \
-            {                                                                                                                      \
-                0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                   /* Door Lock (client): ClearAllPinsResponse */                                                    \
-            { 0x0101, 0x09, 0 }, /* Door Lock (client): SetUserStatusResponse */                                                   \
-            { 0x0101, 0x0A, 0 }, /* Door Lock (client): GetUserStatusResponse */                                                   \
-            {                                                                                                                      \
-                0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetWeekdayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetWeekdayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearWeekdaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearWeekdayScheduleResponse */                                                              \
-            {                                                                                                                      \
-                0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetYeardayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetYeardayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearYeardaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearYeardayScheduleResponse */                                                              \
-            {                                                                                                                      \
-                0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetHolidayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetHolidayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearHolidaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearHolidayScheduleResponse */                                                              \
-            { 0x0101, 0x14,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserType */       \
-            {                                                                                                                      \
-                0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetUserTypeResponse */                                                                       \
-            { 0x0101, 0x15,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserType */       \
-            {                                                                                                                      \
-                0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetUserTypeResponse */                                                                       \
-            { 0x0101, 0x16,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfid */           \
-            { 0x0101, 0x16,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfidResponse */   \
-            { 0x0101, 0x17,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfid */           \
-            { 0x0101, 0x17,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfidResponse */   \
-            { 0x0101, 0x18,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfid */         \
-            { 0x0101, 0x18,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfidResponse */ \
-            { 0x0101, 0x19,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfids */     \
-            {                                                                                                                      \
-                0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                                                   /* Door Lock (client): ClearAllRfidsResponse */                   \
-            { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlGoToPercent */         \
-            { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlStop */                \
-            { 0x0300, 0x00,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHue */     \
-            { 0x0300, 0x01,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveHue */       \
-            { 0x0300, 0x02,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepHue */       \
-            {                                                                                                                      \
-                0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveToSaturation */                                                                      \
-            {                                                                                                                      \
-                0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): StepSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                                                   /* Color Control (client): MoveToHueAndSaturation */              \
-            { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveToColor */                         \
-            { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveColor */                           \
-            { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): StepColor */                           \
-            {                                                                                                                      \
-                0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveToColorTemperature */                                                                \
-            { 0x0300, 0x47,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StopMoveStep */  \
-            {                                                                                                                      \
-                0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveColorTemperature */                                                                  \
-            {                                                                                                                      \
-                0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                                                   /* Color Control (client): StepColorTemperature */                \
-            { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (client): Sleep */                                   \
-            { 0xF000, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Bind */                                      \
-            { 0xF000, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Unbind */                                    \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (client): Identify */ \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (client): IdentifyQueryResponse */ \
+  { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (client): IdentifyQuery */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroup */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): AddGroupResponse */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): ViewGroup */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): ViewGroupResponse */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): GetGroupMembership */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): GetGroupMembershipResponse */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveGroup */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): RemoveGroupResponse */ \
+  { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveAllGroups */ \
+  { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroupIfIdentifying */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): AddScene */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): AddSceneResponse */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): ViewScene */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): ViewSceneResponse */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveScene */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveSceneResponse */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveAllScenes */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveAllScenesResponse */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): StoreScene */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): StoreSceneResponse */ \
+  { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RecallScene */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): GetSceneMembership */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): GetSceneMembershipResponse */ \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Off */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): On */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Toggle */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevel */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Move */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Step */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Stop */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StepWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StopWithOnOff */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Basic (client): MfgSpecificPing */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): Leave */ \
+  { 0x0030, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): SetFabric */ \
+  { 0x0030, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): SetFabricResponse */ \
+  { 0x0030, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): ArmFailSafe */ \
+  { 0x0030, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): ArmFailSafeResponse */ \
+  { 0x0030, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): CommissioningComplete */ \
+  { 0x0030, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): CommissioningCompleteResponse */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): LockDoor */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): LockDoorResponse */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): UnlockDoor */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): UnlockDoorResponse */ \
+  { 0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeout */ \
+  { 0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeoutResponse */ \
+  { 0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecord */ \
+  { 0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecordResponse */ \
+  { 0x0101, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPin */ \
+  { 0x0101, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPinResponse */ \
+  { 0x0101, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPin */ \
+  { 0x0101, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPinResponse */ \
+  { 0x0101, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPin */ \
+  { 0x0101, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPinResponse */ \
+  { 0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPins */ \
+  { 0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPinsResponse */ \
+  { 0x0101, 0x09, 0 }, /* Door Lock (client): SetUserStatusResponse */ \
+  { 0x0101, 0x0A, 0 }, /* Door Lock (client): GetUserStatusResponse */ \
+  { 0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetWeekdaySchedule */ \
+  { 0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetWeekdayScheduleResponse */ \
+  { 0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetWeekdaySchedule */ \
+  { 0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetWeekdayScheduleResponse */ \
+  { 0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearWeekdaySchedule */ \
+  { 0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearWeekdayScheduleResponse */ \
+  { 0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetYeardaySchedule */ \
+  { 0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetYeardayScheduleResponse */ \
+  { 0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetYeardaySchedule */ \
+  { 0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetYeardayScheduleResponse */ \
+  { 0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearYeardaySchedule */ \
+  { 0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearYeardayScheduleResponse */ \
+  { 0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetHolidaySchedule */ \
+  { 0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetHolidayScheduleResponse */ \
+  { 0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetHolidaySchedule */ \
+  { 0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetHolidayScheduleResponse */ \
+  { 0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearHolidaySchedule */ \
+  { 0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearHolidayScheduleResponse */ \
+  { 0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserType */ \
+  { 0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserTypeResponse */ \
+  { 0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserType */ \
+  { 0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserTypeResponse */ \
+  { 0x0101, 0x16, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfid */ \
+  { 0x0101, 0x16, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfidResponse */ \
+  { 0x0101, 0x17, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfid */ \
+  { 0x0101, 0x17, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfidResponse */ \
+  { 0x0101, 0x18, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfid */ \
+  { 0x0101, 0x18, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfidResponse */ \
+  { 0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfids */ \
+  { 0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfidsResponse */ \
+  { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlGoToPercent */ \
+  { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlStop */ \
+  { 0x0300, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHue */ \
+  { 0x0300, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveHue */ \
+  { 0x0300, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepHue */ \
+  { 0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToSaturation */ \
+  { 0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveSaturation */ \
+  { 0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepSaturation */ \
+  { 0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHueAndSaturation */ \
+  { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveToColor */ \
+  { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveColor */ \
+  { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): StepColor */ \
+  { 0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToColorTemperature */ \
+  { 0x0300, 0x47, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StopMoveStep */ \
+  { 0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveColorTemperature */ \
+  { 0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepColorTemperature */ \
+  { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (client): Sleep */ \
+  { 0xF000, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Bind */ \
+  { 0xF000, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Unbind */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (1)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        { 37, 4098 },                                                                                                              \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 37, 4098 },\
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
@@ -437,6 +292,7 @@
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
 #define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (0)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+}
+
+
diff --git a/examples/chip-tool/gen/enums.h b/examples/chip-tool/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/examples/chip-tool/gen/enums.h
+++ b/examples/chip-tool/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/examples/chip-tool/gen/gen_config.h b/examples/chip-tool/gen/gen_config.h
index a61e278bdebe97..822b34addf02cd 100644
--- a/examples/chip-tool/gen/gen_config.h
+++ b/examples/chip-tool/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
diff --git a/examples/chip-tool/gen/print-cluster.h b/examples/chip-tool/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/examples/chip-tool/gen/print-cluster.h
+++ b/examples/chip-tool/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52
diff --git a/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.cpp b/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.cpp
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.cpp
+++ b/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.cpp
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.h b/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.h
+++ b/examples/lighting-app/lighting-common/gen/CHIPClientCallbacks.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.h b/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.h
+++ b/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.mm b/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.mm
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.mm
+++ b/examples/lighting-app/lighting-common/gen/CHIPClustersObjc.mm
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp
index 677745206f2135..e6fe3b8a9ea74b 100644
--- a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp
+++ b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,699 +47,685 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_MOVE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists             = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_STEP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
         }
-        case ZCL_STOP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+        case ZCL_STOP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfLevelControlClusterStopWithOnOffCallback();
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
+        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopWithOnOffCallback();
+                    break;
+        }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
@@ -750,7 +736,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace LevelControl
+}
 
 namespace NetworkCommissioning {
 
@@ -760,907 +746,889 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan NetworkID;
-            bool NetworkIDExists = false;
-            uint64_t Breadcrumb;
-            bool BreadcrumbExists = false;
-            uint32_t TimeoutMs;
-            bool TimeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (NetworkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        NetworkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        NetworkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (BreadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(Breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        BreadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (TimeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(TimeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        TimeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan NetworkID;
+bool NetworkIDExists = false;
+uint64_t Breadcrumb;
+bool BreadcrumbExists = false;
+uint32_t TimeoutMs;
+bool TimeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (NetworkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        NetworkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            NetworkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (BreadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(Breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            BreadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (TimeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(TimeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            TimeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         default: {
@@ -1673,7 +1641,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace NetworkCommissioning
+}
 
 namespace OnOff {
 
@@ -1683,22 +1651,22 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOffCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOffCallback();
+                    break;
         }
         case ZCL_ON_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOnCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOnCallback();
+                    break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterToggleCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterToggleCallback();
+                    break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
@@ -1710,25 +1678,26 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace OnOff
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+    case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+    case ZCL_ON_OFF_CLUSTER_ID :
         clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
     default:
diff --git a/examples/lighting-app/lighting-common/gen/af-structs.h b/examples/lighting-app/lighting-common/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/examples/lighting-app/lighting-common/gen/af-structs.h
+++ b/examples/lighting-app/lighting-common/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/examples/lighting-app/lighting-common/gen/attribute-id.h b/examples/lighting-app/lighting-common/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/examples/lighting-app/lighting-common/gen/attribute-id.h
+++ b/examples/lighting-app/lighting-common/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/examples/lighting-app/lighting-common/gen/attribute-size.h b/examples/lighting-app/lighting-common/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/examples/lighting-app/lighting-common/gen/attribute-size.h
+++ b/examples/lighting-app/lighting-common/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/examples/lighting-app/lighting-common/gen/attribute-type.h b/examples/lighting-app/lighting-common/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/examples/lighting-app/lighting-common/gen/attribute-type.h
+++ b/examples/lighting-app/lighting-common/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/examples/lighting-app/lighting-common/gen/call-command-handler.cpp b/examples/lighting-app/lighting-common/gen/call-command-handler.cpp
index 7367eb75cbe371..4cda0328084127 100644
--- a/examples/lighting-app/lighting-common/gen/call-command-handler.cpp
+++ b/examples/lighting-app/lighting-common/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -33,6 +33,7 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
 EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -53,6 +54,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -72,17 +74,17 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        case ZCL_LEVEL_CONTROL_CLUSTER_ID :
             result = emberAfLevelControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
             result = emberAfNetworkCommissioningClusterServerCommandParse(cmd);
             break;
-        case ZCL_ON_OFF_CLUSTER_ID:
+        case ZCL_ON_OFF_CLUSTER_ID :
             result = emberAfOnOffClusterServerCommandParse(cmd);
             break;
         default:
@@ -104,203 +106,203 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
         switch (cmd->commandId)
         {
         case ZCL_MOVE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
             break;
         }
         case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
             break;
         }
         case ZCL_STEP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
             break;
         }
         case ZCL_STOP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
             break;
         }
         case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
-            wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
+        wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
             break;
         }
         default: {
@@ -320,276 +322,276 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan NetworkID;
-            uint64_t Breadcrumb;
-            uint32_t TimeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                NetworkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            Breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan NetworkID;
+uint64_t Breadcrumb;
+uint32_t TimeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  NetworkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  Breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         default: {
@@ -609,15 +611,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd)
         switch (cmd->commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOffCallback();
+        wasHandled = emberAfOnOffClusterOffCallback();
             break;
         }
         case ZCL_ON_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOnCallback();
+        wasHandled = emberAfOnOffClusterOnCallback();
             break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterToggleCallback();
+        wasHandled = emberAfOnOffClusterToggleCallback();
             break;
         }
         default: {
diff --git a/examples/lighting-app/lighting-common/gen/callback-stub.cpp b/examples/lighting-app/lighting-common/gen/callback-stub.cpp
index d54f58e89049d4..ce090ca11ca60b 100644
--- a/examples/lighting-app/lighting-common/gen/callback-stub.cpp
+++ b/examples/lighting-app/lighting-common/gen/callback-stub.cpp
@@ -29,16 +29,16 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+     case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+     case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         emberAfNetworkCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+     case ZCL_ON_OFF_CLUSTER_ID :
         emberAfOnOffClusterInitCallback(endpoint);
         break;
     default:
@@ -132,9 +132,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -149,8 +150,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -165,8 +167,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -183,7 +186,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -200,7 +204,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -217,7 +222,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -242,8 +248,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -262,9 +269,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -283,9 +290,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -303,7 +310,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -327,7 +335,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -350,9 +359,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -374,9 +384,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -396,10 +407,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -412,7 +425,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -453,9 +467,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -471,7 +486,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -522,9 +538,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -540,7 +557,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -576,8 +594,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -612,8 +631,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/examples/lighting-app/lighting-common/gen/callback.h b/examples/lighting-app/lighting-common/gen/callback.h
index b47ae316a9a3e6..2609e51616c6a3 100644
--- a/examples/lighting-app/lighting-common/gen/callback.h
+++ b/examples/lighting-app/lighting-common/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Level Control Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Network Commissioning Cluster Init
  *
  * Cluster Init
@@ -63,6 +66,7 @@ void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief On/off Cluster Init
  *
  * Cluster Init
@@ -71,8 +75,10 @@ void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Basic Cluster server
 //
@@ -102,8 +108,7 @@ void emberAfBasicClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Server Message Sent
  *
@@ -116,8 +121,7 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Server Pre Attribute Changed
  *
@@ -129,9 +133,7 @@ void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Server Tick
  *
@@ -170,9 +172,7 @@ void emberAfLevelControlClusterServerAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Level Control Cluster Server Message Sent
  *
@@ -185,9 +185,7 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Level Control Cluster Server Pre Attribute Changed
  *
@@ -199,9 +197,7 @@ void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Level Control Cluster Server Tick
  *
@@ -240,9 +236,7 @@ void emberAfNetworkCommissioningClusterServerAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Network Commissioning Cluster Server Message Sent
  *
@@ -255,9 +249,7 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Network Commissioning Cluster Server Pre Attribute Changed
  *
@@ -269,10 +261,7 @@ void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Network Commissioning Cluster Server Tick
  *
@@ -311,8 +300,7 @@ void emberAfOnOffClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief On/off Cluster Server Message Sent
  *
@@ -325,8 +313,7 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief On/off Cluster Server Pre Attribute Changed
  *
@@ -338,9 +325,7 @@ void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief On/off Cluster Server Tick
  *
@@ -353,180 +338,175 @@ void emberAfOnOffClusterServerTickCallback(chip::EndpointId endpoint);
 // Cluster Commands Callback
 
 /**
- * @brief Level Control Cluster Move Command callback
- * @param moveMode
- * @param rate
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Move Command callback
+* @param moveMode
+* @param rate
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevel Command callback
- * @param level
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster MoveToLevel Command callback
+* @param level
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask,
-                                                   uint8_t optionOverride);
+bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevelWithOnOff Command callback
- * @param level
- * @param transitionTime
- */
+* @brief Level Control Cluster MoveToLevelWithOnOff Command callback
+* @param level
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster MoveWithOnOff Command callback
- * @param moveMode
- * @param rate
- */
+* @brief Level Control Cluster MoveWithOnOff Command callback
+* @param moveMode
+* @param rate
+*/
 
 bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate);
 
 /**
- * @brief Level Control Cluster Step Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Step Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask,
-                                            uint8_t optionOverride);
+bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StepWithOnOff Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- */
+* @brief Level Control Cluster StepWithOnOff Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster Stop Command callback
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Stop Command callback
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StopWithOnOff Command callback
- */
+* @brief Level Control Cluster StopWithOnOff Command callback
+*/
 
 bool emberAfLevelControlClusterStopWithOnOffCallback();
 
 /**
- * @brief Network Commissioning Cluster AddThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster AddWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb,
-                                                              uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster DisableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster DisableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster EnableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster EnableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster RemoveNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster RemoveNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs);
 
 /**
- * @brief Network Commissioning Cluster ScanNetworks Command callback
- * @param ssid
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster ScanNetworks Command callback
+* @param ssid
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                   uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                 uint64_t breadcrumb, uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief On/off Cluster Off Command callback
- */
+* @brief On/off Cluster Off Command callback
+*/
 
 bool emberAfOnOffClusterOffCallback();
 
 /**
- * @brief On/off Cluster On Command callback
- */
+* @brief On/off Cluster On Command callback
+*/
 
 bool emberAfOnOffClusterOnCallback();
 
 /**
- * @brief On/off Cluster Toggle Command callback
- */
+* @brief On/off Cluster Toggle Command callback
+*/
 
 bool emberAfOnOffClusterToggleCallback();
 
+
 //
 // Non-Cluster Related Callbacks
 //
@@ -683,8 +663,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -703,6 +683,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -720,6 +701,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -813,8 +795,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -973,8 +955,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/examples/lighting-app/lighting-common/gen/client-command-macro.h b/examples/lighting-app/lighting-common/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/examples/lighting-app/lighting-common/gen/client-command-macro.h
+++ b/examples/lighting-app/lighting-common/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/examples/lighting-app/lighting-common/gen/cluster-id.h b/examples/lighting-app/lighting-common/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/examples/lighting-app/lighting-common/gen/cluster-id.h
+++ b/examples/lighting-app/lighting-common/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/examples/lighting-app/lighting-common/gen/command-id.h b/examples/lighting-app/lighting-common/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/examples/lighting-app/lighting-common/gen/command-id.h
+++ b/examples/lighting-app/lighting-common/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/examples/lighting-app/lighting-common/gen/endpoint_config.h b/examples/lighting-app/lighting-common/gen/endpoint_config.h
index d7e7ffe877909f..d0db31181feb42 100644
--- a/examples/lighting-app/lighting-common/gen/endpoint_config.h
+++ b/examples/lighting-app/lighting-common/gen/endpoint_config.h
@@ -20,184 +20,135 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                                  \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                       \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                               \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                    \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (7)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT 17
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },         /* On/off (server): cluster revision */                 \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */                           \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },     /* Level Control (server): cluster revision */          \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },   /* Level Control (server): current level */             \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                      \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(0) },                                                      /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(32) },                                                     /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */                                                       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */                                                        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */                                          \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */                                                \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(180) },                               /* Basic (server): SoftwareVersionString */            \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */ \
-    }
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): current level */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(32) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(180) }, /* Basic (server): SoftwareVersionString */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
-    const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
-        (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {                                                      \
-        (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,                                              \
-    };
-
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+#define GENERATED_FUNCTION_ARRAYS   \
+const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,\
+};\
+
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT 4
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x0006,                                                                                                                \
-            ZAP_ATTRIBUTE_INDEX(0),                                                                                                \
-            2,                                                                                                                     \
-            3,                                                                                                                     \
-            ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                            \
-            chipFuncArrayOnOffServer                                                                                               \
-        }, /* Endpoint: 1, Cluster: On/off (server) */                                                                             \
-            { 0x0008,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(2),                                                                                              \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */                                \
-            {                                                                                                                      \
-                0x0028, ZAP_ATTRIBUTE_INDEX(4), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL                                            \
-            }, /* Endpoint: 1, Cluster: Basic (server) */                                                                          \
-            {                                                                                                                      \
-                0x0031, ZAP_ATTRIBUTE_INDEX(16), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Network Commissioning (server) */                                                          \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_CLUSTERS { \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(0), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(2), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(4), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Basic (server) */ \
+  { 0x0031, ZAP_ATTRIBUTE_INDEX(16), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Network Commissioning (server) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 4, 262 },                                                                                          \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 4, 262 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (65)
@@ -213,109 +164,85 @@
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0001                                                                                                                     \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0001 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0104                                                                                                                     \
-    }
+#define FIXED_PROFILE_IDS { 0x0104 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_DEVICE_IDS { 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1                                                                                                                          \
-    }
+#define FIXED_DEVICE_VERSIONS { 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_ENDPOINT_TYPES { 0 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_NETWORKS { 0 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (31)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) },     /* On/off (server): Off */                                        \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */                         \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */                                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */                       \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */                \
-            { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */        \
-            { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */              \
-            { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */      \
-            { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */           \
-            { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */   \
-            { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */            \
-            { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */    \
-            { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */         \
-            { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
-            { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */               \
-            { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */       \
-            { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */               \
-            { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */       \
-            { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */              \
-            { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */      \
-            { 0x0031, 0x10,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */         \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */ \
+  { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */ \
+  { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */ \
+  { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */ \
+  { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */ \
+  { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */ \
+  { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */ \
+  { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */ \
+  { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */ \
+  { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
+  { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */ \
+  { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */ \
+  { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */ \
+  { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */ \
+  { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */ \
+  { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */ \
+  { 0x0031, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
@@ -323,12 +250,9 @@
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
 #define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (2)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }          \
-        }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */                                                \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */                              \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */ \
+}
+
+
diff --git a/examples/lighting-app/lighting-common/gen/enums.h b/examples/lighting-app/lighting-common/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/examples/lighting-app/lighting-common/gen/enums.h
+++ b/examples/lighting-app/lighting-common/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/examples/lighting-app/lighting-common/gen/gen_config.h b/examples/lighting-app/lighting-common/gen/gen_config.h
index 524f4fb920a18d..f7fb78823e893f 100644
--- a/examples/lighting-app/lighting-common/gen/gen_config.h
+++ b/examples/lighting-app/lighting-common/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
diff --git a/examples/lighting-app/lighting-common/gen/print-cluster.h b/examples/lighting-app/lighting-common/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/examples/lighting-app/lighting-common/gen/print-cluster.h
+++ b/examples/lighting-app/lighting-common/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52
diff --git a/examples/lock-app/lock-common/gen/CHIPClientCallbacks.cpp b/examples/lock-app/lock-common/gen/CHIPClientCallbacks.cpp
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lock-app/lock-common/gen/CHIPClientCallbacks.cpp
+++ b/examples/lock-app/lock-common/gen/CHIPClientCallbacks.cpp
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lock-app/lock-common/gen/CHIPClientCallbacks.h b/examples/lock-app/lock-common/gen/CHIPClientCallbacks.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lock-app/lock-common/gen/CHIPClientCallbacks.h
+++ b/examples/lock-app/lock-common/gen/CHIPClientCallbacks.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lock-app/lock-common/gen/CHIPClustersObjc.h b/examples/lock-app/lock-common/gen/CHIPClustersObjc.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lock-app/lock-common/gen/CHIPClustersObjc.h
+++ b/examples/lock-app/lock-common/gen/CHIPClustersObjc.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lock-app/lock-common/gen/CHIPClustersObjc.mm b/examples/lock-app/lock-common/gen/CHIPClustersObjc.mm
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/lock-app/lock-common/gen/CHIPClustersObjc.mm
+++ b/examples/lock-app/lock-common/gen/CHIPClustersObjc.mm
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp
index 8ee352865c2e4b..086a4052a1aa18 100644
--- a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp
+++ b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,907 +47,889 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan NetworkID;
-            bool NetworkIDExists = false;
-            uint64_t Breadcrumb;
-            bool BreadcrumbExists = false;
-            uint32_t TimeoutMs;
-            bool TimeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (NetworkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        NetworkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        NetworkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (BreadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(Breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        BreadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (TimeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(TimeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        TimeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan NetworkID;
+bool NetworkIDExists = false;
+uint64_t Breadcrumb;
+bool BreadcrumbExists = false;
+uint32_t TimeoutMs;
+bool TimeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (NetworkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        NetworkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            NetworkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (BreadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(Breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            BreadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (TimeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(TimeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            TimeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
 
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         default: {
@@ -960,7 +942,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace NetworkCommissioning
+}
 
 namespace OnOff {
 
@@ -970,22 +952,22 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOffCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOffCallback();
+                    break;
         }
         case ZCL_ON_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOnCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOnCallback();
+                    break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterToggleCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterToggleCallback();
+                    break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
@@ -997,22 +979,23 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace OnOff
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+    case ZCL_ON_OFF_CLUSTER_ID :
         clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
     default:
diff --git a/examples/lock-app/lock-common/gen/af-structs.h b/examples/lock-app/lock-common/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/examples/lock-app/lock-common/gen/af-structs.h
+++ b/examples/lock-app/lock-common/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/examples/lock-app/lock-common/gen/attribute-id.h b/examples/lock-app/lock-common/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/examples/lock-app/lock-common/gen/attribute-id.h
+++ b/examples/lock-app/lock-common/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/examples/lock-app/lock-common/gen/attribute-size.h b/examples/lock-app/lock-common/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/examples/lock-app/lock-common/gen/attribute-size.h
+++ b/examples/lock-app/lock-common/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/examples/lock-app/lock-common/gen/attribute-type.h b/examples/lock-app/lock-common/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/examples/lock-app/lock-common/gen/attribute-type.h
+++ b/examples/lock-app/lock-common/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/examples/lock-app/lock-common/gen/call-command-handler.cpp b/examples/lock-app/lock-common/gen/call-command-handler.cpp
index f28cd0e98b63e9..b90489fa915ec0 100644
--- a/examples/lock-app/lock-common/gen/call-command-handler.cpp
+++ b/examples/lock-app/lock-common/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -32,6 +32,7 @@ EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd)
 EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -52,6 +53,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -71,14 +73,14 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
             result = emberAfNetworkCommissioningClusterServerCommandParse(cmd);
             break;
-        case ZCL_ON_OFF_CLUSTER_ID:
+        case ZCL_ON_OFF_CLUSTER_ID :
             result = emberAfOnOffClusterServerCommandParse(cmd);
             break;
         default:
@@ -100,276 +102,276 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+  if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan NetworkID;
-            uint64_t Breadcrumb;
-            uint32_t TimeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                NetworkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            Breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan NetworkID;
+uint64_t Breadcrumb;
+uint32_t TimeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  NetworkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  Breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         default: {
@@ -389,15 +391,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd)
         switch (cmd->commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOffCallback();
+        wasHandled = emberAfOnOffClusterOffCallback();
             break;
         }
         case ZCL_ON_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOnCallback();
+        wasHandled = emberAfOnOffClusterOnCallback();
             break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterToggleCallback();
+        wasHandled = emberAfOnOffClusterToggleCallback();
             break;
         }
         default: {
diff --git a/examples/lock-app/lock-common/gen/callback-stub.cpp b/examples/lock-app/lock-common/gen/callback-stub.cpp
index cb41d40aaf9e6e..79d77b16c2bcff 100644
--- a/examples/lock-app/lock-common/gen/callback-stub.cpp
+++ b/examples/lock-app/lock-common/gen/callback-stub.cpp
@@ -29,13 +29,13 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+     case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         emberAfNetworkCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+     case ZCL_ON_OFF_CLUSTER_ID :
         emberAfOnOffClusterInitCallback(endpoint);
         break;
     default:
@@ -124,9 +124,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -141,8 +142,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -157,8 +159,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -175,7 +178,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -192,7 +196,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -209,7 +214,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -234,8 +240,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -254,9 +261,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -275,9 +282,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -295,7 +302,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -319,7 +327,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -342,9 +351,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -366,9 +376,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -388,10 +399,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -404,7 +417,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -445,9 +459,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -463,7 +478,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -514,9 +530,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -532,7 +549,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -568,8 +586,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -604,8 +623,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/examples/lock-app/lock-common/gen/callback.h b/examples/lock-app/lock-common/gen/callback.h
index cdc77b3a6450bf..9cea66f8ff327b 100644
--- a/examples/lock-app/lock-common/gen/callback.h
+++ b/examples/lock-app/lock-common/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Network Commissioning Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief On/off Cluster Init
  *
  * Cluster Init
@@ -63,8 +66,10 @@ void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Basic Cluster server
 //
@@ -94,8 +99,7 @@ void emberAfBasicClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Server Message Sent
  *
@@ -108,8 +112,7 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Server Pre Attribute Changed
  *
@@ -121,9 +124,7 @@ void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Server Tick
  *
@@ -162,9 +163,7 @@ void emberAfNetworkCommissioningClusterServerAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Network Commissioning Cluster Server Message Sent
  *
@@ -177,9 +176,7 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Network Commissioning Cluster Server Pre Attribute Changed
  *
@@ -191,10 +188,7 @@ void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Network Commissioning Cluster Server Tick
  *
@@ -233,8 +227,7 @@ void emberAfOnOffClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief On/off Cluster Server Message Sent
  *
@@ -247,8 +240,7 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief On/off Cluster Server Pre Attribute Changed
  *
@@ -260,9 +252,7 @@ void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief On/off Cluster Server Tick
  *
@@ -275,108 +265,105 @@ void emberAfOnOffClusterServerTickCallback(chip::EndpointId endpoint);
 // Cluster Commands Callback
 
 /**
- * @brief Network Commissioning Cluster AddThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster AddWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb,
-                                                              uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster DisableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster DisableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster EnableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster EnableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster RemoveNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster RemoveNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs);
 
 /**
- * @brief Network Commissioning Cluster ScanNetworks Command callback
- * @param ssid
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster ScanNetworks Command callback
+* @param ssid
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                   uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                 uint64_t breadcrumb, uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief On/off Cluster Off Command callback
- */
+* @brief On/off Cluster Off Command callback
+*/
 
 bool emberAfOnOffClusterOffCallback();
 
 /**
- * @brief On/off Cluster On Command callback
- */
+* @brief On/off Cluster On Command callback
+*/
 
 bool emberAfOnOffClusterOnCallback();
 
 /**
- * @brief On/off Cluster Toggle Command callback
- */
+* @brief On/off Cluster Toggle Command callback
+*/
 
 bool emberAfOnOffClusterToggleCallback();
 
+
 //
 // Non-Cluster Related Callbacks
 //
@@ -533,8 +520,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -553,6 +540,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -570,6 +558,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -663,8 +652,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -823,8 +812,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/examples/lock-app/lock-common/gen/client-command-macro.h b/examples/lock-app/lock-common/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/examples/lock-app/lock-common/gen/client-command-macro.h
+++ b/examples/lock-app/lock-common/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/examples/lock-app/lock-common/gen/cluster-id.h b/examples/lock-app/lock-common/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/examples/lock-app/lock-common/gen/cluster-id.h
+++ b/examples/lock-app/lock-common/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/examples/lock-app/lock-common/gen/command-id.h b/examples/lock-app/lock-common/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/examples/lock-app/lock-common/gen/command-id.h
+++ b/examples/lock-app/lock-common/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/examples/lock-app/lock-common/gen/endpoint_config.h b/examples/lock-app/lock-common/gen/endpoint_config.h
index a3ff756f345ee8..9a4d352a09e4ea 100644
--- a/examples/lock-app/lock-common/gen/endpoint_config.h
+++ b/examples/lock-app/lock-common/gen/endpoint_config.h
@@ -20,173 +20,129 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                                  \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                       \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                               \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                    \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (7)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT 15
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },         /* On/off (server): cluster revision */                 \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */                           \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                      \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(0) },                                                      /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(32) },                                                     /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */                                                       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */                                                        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */                                          \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */                                                \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(180) },                               /* Basic (server): SoftwareVersionString */            \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */ \
-    }
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(32) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(180) }, /* Basic (server): SoftwareVersionString */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
-    const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
-        (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
-    };
+#define GENERATED_FUNCTION_ARRAYS   \
+const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,\
+};\
 
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT 3
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x0006,                                                                                                                \
-            ZAP_ATTRIBUTE_INDEX(0),                                                                                                \
-            2,                                                                                                                     \
-            3,                                                                                                                     \
-            ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                            \
-            chipFuncArrayOnOffServer                                                                                               \
-        }, /* Endpoint: 1, Cluster: On/off (server) */                                                                             \
-            {                                                                                                                      \
-                0x0028, ZAP_ATTRIBUTE_INDEX(2), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL                                            \
-            }, /* Endpoint: 1, Cluster: Basic (server) */                                                                          \
-            {                                                                                                                      \
-                0x0031, ZAP_ATTRIBUTE_INDEX(14), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Network Commissioning (server) */                                                          \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_CLUSTERS { \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(0), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(2), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Basic (server) */ \
+  { 0x0031, ZAP_ATTRIBUTE_INDEX(14), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Network Commissioning (server) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 3, 259 },                                                                                          \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 3, 259 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (65)
@@ -202,101 +158,77 @@
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0001                                                                                                                     \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0001 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0109                                                                                                                     \
-    }
+#define FIXED_PROFILE_IDS { 0x0109 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_DEVICE_IDS { 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1                                                                                                                          \
-    }
+#define FIXED_DEVICE_VERSIONS { 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_ENDPOINT_TYPES { 0 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_NETWORKS { 0 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (23)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) },     /* On/off (server): Off */                                        \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */                \
-            { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */        \
-            { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */              \
-            { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */      \
-            { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */           \
-            { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */   \
-            { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */            \
-            { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */    \
-            { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */         \
-            { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
-            { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */               \
-            { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */       \
-            { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */               \
-            { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */       \
-            { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */              \
-            { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */      \
-            { 0x0031, 0x10,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */         \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */ \
+  { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */ \
+  { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */ \
+  { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */ \
+  { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */ \
+  { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */ \
+  { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */ \
+  { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */ \
+  { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */ \
+  { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
+  { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */ \
+  { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */ \
+  { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */ \
+  { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */ \
+  { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */ \
+  { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */ \
+  { 0x0031, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
@@ -304,9 +236,8 @@
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
 #define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (1)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }          \
-        }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */                                                \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */ \
+}
+
+
diff --git a/examples/lock-app/lock-common/gen/enums.h b/examples/lock-app/lock-common/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/examples/lock-app/lock-common/gen/enums.h
+++ b/examples/lock-app/lock-common/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/examples/lock-app/lock-common/gen/gen_config.h b/examples/lock-app/lock-common/gen/gen_config.h
index 48ae4c3873f632..1a5561d51438be 100644
--- a/examples/lock-app/lock-common/gen/gen_config.h
+++ b/examples/lock-app/lock-common/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
diff --git a/examples/lock-app/lock-common/gen/print-cluster.h b/examples/lock-app/lock-common/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/examples/lock-app/lock-common/gen/print-cluster.h
+++ b/examples/lock-app/lock-common/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52
diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.cpp b/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.cpp
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.cpp
+++ b/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.cpp
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.h b/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/CHIPClientCallbacks.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.h b/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.h
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.h
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.mm b/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.mm
index 759d13c5028d26..595c6538a0edf2 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.mm
+++ b/examples/temperature-measurement-app/esp32/main/gen/CHIPClustersObjc.mm
@@ -16,3 +16,4 @@
  */
 
 // THIS FILE IS GENERATED BY ZAP
+
diff --git a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp
index bf4e0c3bd2320c..41ed466ab3addf 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp
+++ b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,907 +47,889 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan NetworkID;
-            bool NetworkIDExists = false;
-            uint64_t Breadcrumb;
-            bool BreadcrumbExists = false;
-            uint32_t TimeoutMs;
-            bool TimeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (NetworkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        NetworkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        NetworkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (BreadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(Breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        BreadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (TimeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(TimeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        TimeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan NetworkID;
+bool NetworkIDExists = false;
+uint64_t Breadcrumb;
+bool BreadcrumbExists = false;
+uint32_t TimeoutMs;
+bool TimeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (NetworkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        NetworkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            NetworkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (BreadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(Breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            BreadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (TimeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(TimeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            TimeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         default: {
@@ -960,19 +942,20 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace NetworkCommissioning
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
     default:
diff --git a/examples/temperature-measurement-app/esp32/main/gen/af-structs.h b/examples/temperature-measurement-app/esp32/main/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/af-structs.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h b/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/examples/temperature-measurement-app/esp32/main/gen/attribute-size.h b/examples/temperature-measurement-app/esp32/main/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/attribute-size.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/examples/temperature-measurement-app/esp32/main/gen/attribute-type.h b/examples/temperature-measurement-app/esp32/main/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/attribute-type.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp b/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp
index 39d558dceb842e..ef0e1ba1069095 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp
+++ b/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -32,6 +32,7 @@ EmberAfStatus emberAfBasicClusterServerCommandParse(EmberAfClusterCommand * cmd)
 EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfTemperatureMeasurementClusterServerCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -52,6 +53,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -71,14 +73,14 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
             result = emberAfNetworkCommissioningClusterServerCommandParse(cmd);
             break;
-        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
             // No commands are enabled for cluster Temperature Measurement
             result = status(false, true, cmd->mfgSpecific);
             break;
@@ -101,276 +103,276 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+  if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan NetworkID;
-            uint64_t Breadcrumb;
-            uint32_t TimeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                NetworkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            Breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan NetworkID;
+uint64_t Breadcrumb;
+uint32_t TimeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  NetworkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  Breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         default: {
diff --git a/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp b/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp
index b8046dc2ed1aea..ec1e626404b0f2 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp
+++ b/examples/temperature-measurement-app/esp32/main/gen/callback-stub.cpp
@@ -29,13 +29,13 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+     case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         emberAfNetworkCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+     case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
         emberAfTemperatureMeasurementClusterInitCallback(endpoint);
         break;
     default:
@@ -124,9 +124,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -141,8 +142,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -157,8 +159,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -175,7 +178,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -192,7 +196,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -209,7 +214,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -234,8 +240,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -254,9 +261,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -275,9 +282,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -295,7 +302,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -319,7 +327,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -342,9 +351,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -366,9 +376,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -388,10 +399,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -404,7 +417,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -445,9 +459,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -463,7 +478,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -514,9 +530,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -532,7 +549,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -568,8 +586,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -604,8 +623,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/examples/temperature-measurement-app/esp32/main/gen/callback.h b/examples/temperature-measurement-app/esp32/main/gen/callback.h
index 50f828f9ff3177..0fd076366c9534 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/callback.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Network Commissioning Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Temperature Measurement Cluster Init
  *
  * Cluster Init
@@ -63,8 +66,10 @@ void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfTemperatureMeasurementClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Basic Cluster server
 //
@@ -94,8 +99,7 @@ void emberAfBasicClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Server Message Sent
  *
@@ -108,8 +112,7 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Server Pre Attribute Changed
  *
@@ -121,9 +124,7 @@ void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Server Tick
  *
@@ -162,9 +163,7 @@ void emberAfNetworkCommissioningClusterServerAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Network Commissioning Cluster Server Message Sent
  *
@@ -177,9 +176,7 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Network Commissioning Cluster Server Pre Attribute Changed
  *
@@ -191,10 +188,7 @@ void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Network Commissioning Cluster Server Tick
  *
@@ -233,9 +227,7 @@ void emberAfTemperatureMeasurementClusterServerAttributeChangedCallback(chip::En
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                            chip::AttributeId attributeId,
-                                                                                            uint16_t manufacturerCode);
+void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Temperature Measurement Cluster Server Message Sent
  *
@@ -248,9 +240,7 @@ void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChan
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                   EmberStatus status);
+void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Temperature Measurement Cluster Server Pre Attribute Changed
  *
@@ -262,10 +252,7 @@ void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoing
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfTemperatureMeasurementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    EmberAfAttributeType attributeType,
-                                                                                    uint8_t size, uint8_t * value);
+EmberAfStatus emberAfTemperatureMeasurementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Temperature Measurement Cluster Server Tick
  *
@@ -278,89 +265,86 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end
 // Cluster Commands Callback
 
 /**
- * @brief Network Commissioning Cluster AddThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster AddWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb,
-                                                              uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster DisableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster DisableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster EnableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster EnableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster RemoveNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster RemoveNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs);
 
 /**
- * @brief Network Commissioning Cluster ScanNetworks Command callback
- * @param ssid
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster ScanNetworks Command callback
+* @param ssid
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                   uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
+
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                 uint64_t breadcrumb, uint32_t timeoutMs);
 
 //
 // Non-Cluster Related Callbacks
@@ -518,8 +502,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -538,6 +522,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -555,6 +540,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -648,8 +634,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -808,8 +794,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/examples/temperature-measurement-app/esp32/main/gen/client-command-macro.h b/examples/temperature-measurement-app/esp32/main/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/client-command-macro.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/examples/temperature-measurement-app/esp32/main/gen/cluster-id.h b/examples/temperature-measurement-app/esp32/main/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/cluster-id.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/examples/temperature-measurement-app/esp32/main/gen/command-id.h b/examples/temperature-measurement-app/esp32/main/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/command-id.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/examples/temperature-measurement-app/esp32/main/gen/endpoint_config.h b/examples/temperature-measurement-app/esp32/main/gen/endpoint_config.h
index fb4f6335377b06..30668d64980ae3 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/endpoint_config.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/endpoint_config.h
@@ -20,167 +20,128 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                                  \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                       \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                               \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                    \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (7)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT 17
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                              \
-          ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                          \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(0) },                                                      /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(32) },                                                     /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */                                                       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */                                                        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */                                          \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */                                                \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(180) },                               /* Basic (server): SoftwareVersionString */            \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */ \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (server): cluster revision */    \
-            { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): measured value */ \
-            { 0x0001, ZAP_TYPE(INT16S), 2, 0,                                                                                      \
-              ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): min measured value */                             \
-            { 0x0002, ZAP_TYPE(INT16S), 2, 0,                                                                                      \
-              ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): max measured value */                             \
-    }
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(32) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(180) }, /* Basic (server): SoftwareVersionString */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): measured value */  \
+  { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): min measured value */  \
+  { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): max measured value */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS
+#define GENERATED_FUNCTION_ARRAYS   \
 
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT 3
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0028, ZAP_ATTRIBUTE_INDEX(0), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Basic (server) */    \
-            {                                                                                                                      \
-                0x0031, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Network Commissioning (server) */                                                          \
-            {                                                                                                                      \
-                0x0402, ZAP_ATTRIBUTE_INDEX(13), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                        \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_CLUSTERS { \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(0), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Basic (server) */ \
+  { 0x0031, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Network Commissioning (server) */ \
+  { 0x0402, ZAP_ATTRIBUTE_INDEX(13), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 3, 264 },                                                                                          \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 3, 264 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (65)
@@ -196,98 +157,74 @@
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0001                                                                                                                     \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0001 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0105                                                                                                                     \
-    }
+#define FIXED_PROFILE_IDS { 0x0105 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_DEVICE_IDS { 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1                                                                                                                          \
-    }
+#define FIXED_DEVICE_VERSIONS { 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_ENDPOINT_TYPES { 0 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_NETWORKS { 0 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (20)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) },     /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */                \
-            { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */        \
-            { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */              \
-            { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */      \
-            { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */           \
-            { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */   \
-            { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */            \
-            { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */    \
-            { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */         \
-            { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
-            { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */               \
-            { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */       \
-            { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */               \
-            { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */       \
-            { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */              \
-            { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */      \
-            { 0x0031, 0x10,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */         \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */ \
+  { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */ \
+  { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */ \
+  { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */ \
+  { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */ \
+  { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */ \
+  { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */ \
+  { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */ \
+  { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */ \
+  { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
+  { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */ \
+  { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */ \
+  { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */ \
+  { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */ \
+  { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */ \
+  { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */ \
+  { 0x0031, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
@@ -295,9 +232,8 @@
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
 #define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (1)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0402, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }          \
-        }, /* Reporting for cluster: "Temperature Measurement", attribute: "measured value". side: server */                       \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0402, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Temperature Measurement", attribute: "measured value". side: server */ \
+}
+
+
diff --git a/examples/temperature-measurement-app/esp32/main/gen/enums.h b/examples/temperature-measurement-app/esp32/main/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/enums.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/examples/temperature-measurement-app/esp32/main/gen/gen_config.h b/examples/temperature-measurement-app/esp32/main/gen/gen_config.h
index d6a95b43b2b908..26f541839d9e98 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/gen_config.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
diff --git a/examples/temperature-measurement-app/esp32/main/gen/print-cluster.h b/examples/temperature-measurement-app/esp32/main/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/examples/temperature-measurement-app/esp32/main/gen/print-cluster.h
+++ b/examples/temperature-measurement-app/esp32/main/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52
diff --git a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp b/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp
index c4a6c900db7c1b..a711b776c52ffa 100644
--- a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp
+++ b/examples/tv-app/tv-common/gen/CHIPClientCallbacks.cpp
@@ -20,10 +20,10 @@
 #include "gen/CHIPClientCallbacks.h"
 
 #include "gen/enums.h"
-#include <app/util/CHIPDeviceCallbacksMgr.h>
-#include <app/util/af-enums.h>
 #include <app/util/af.h>
+#include <app/util/af-enums.h>
 #include <app/util/basic-types.h>
+#include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <core/CHIPEncoding.h>
 #include <support/SafeInt.h>
 #include <support/logging/CHIPLogging.h>
@@ -212,14 +212,12 @@ bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, Em
     GET_RESPONSE_CALLBACKS("emberAfDefaultResponseCallback");
     if (status == EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultSuccessCallback> * cb =
-            Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+        Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
         cb->mCall(cb->mContext);
     }
     else
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, static_cast<uint8_t>(status));
     }
 
@@ -252,216 +250,203 @@ bool emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * messag
 
             switch (attributeType)
             {
-            case 0x00: // nodata / No data
-            case 0x0A: // data24 / 24-bit data
-            case 0x0C: // data40 / 40-bit data
-            case 0x0D: // data48 / 48-bit data
-            case 0x0E: // data56 / 56-bit data
-            case 0x1A: // map24 / 24-bit bitmap
-            case 0x1C: // map40 / 40-bit bitmap
-            case 0x1D: // map48 / 48-bit bitmap
-            case 0x1E: // map56 / 56-bit bitmap
-            case 0x22: // uint24 / Unsigned 24-bit integer
-            case 0x24: // uint40 / Unsigned 40-bit integer
-            case 0x25: // uint48 / Unsigned 48-bit integer
-            case 0x26: // uint56 / Unsigned 56-bit integer
-            case 0x2A: // int24 / Signed 24-bit integer
-            case 0x2C: // int40 / Signed 40-bit integer
-            case 0x2D: // int48 / Signed 48-bit integer
-            case 0x2E: // int56 / Signed 56-bit integer
-            case 0x38: // semi / Semi-precision
-            case 0x39: // single / Single precision
-            case 0x3A: // double / Double precision
-            case 0x48: // array / Array
-            case 0x49: // struct / Structure
-            case 0x50: // set / Set
-            case 0x51: // bag / Bag
-            case 0xE0: // ToD / Time of day
-            {
-                ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
-                Callback::Callback<DefaultFailureCallback> * cb =
-                    Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
-                cb->mCall(cb->mContext, EMBER_ZCL_STATUS_INVALID_VALUE);
-                return true;
-            }
-
-            case 0x41: // octstr / Octet string
-            case 0x42: // string / Character string
-            {
-                // Short Strings must contains at least one byte for the length
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t length = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-                // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
-                if (length == 0xFF)
+                case 0x00: // nodata / No data
+                case 0x0A: // data24 / 24-bit data
+                case 0x0C: // data40 / 40-bit data
+                case 0x0D: // data48 / 48-bit data
+                case 0x0E: // data56 / 56-bit data
+                case 0x1A: // map24 / 24-bit bitmap
+                case 0x1C: // map40 / 40-bit bitmap
+                case 0x1D: // map48 / 48-bit bitmap
+                case 0x1E: // map56 / 56-bit bitmap
+                case 0x22: // uint24 / Unsigned 24-bit integer
+                case 0x24: // uint40 / Unsigned 40-bit integer
+                case 0x25: // uint48 / Unsigned 48-bit integer
+                case 0x26: // uint56 / Unsigned 56-bit integer
+                case 0x2A: // int24 / Signed 24-bit integer
+                case 0x2C: // int40 / Signed 40-bit integer
+                case 0x2D: // int48 / Signed 48-bit integer
+                case 0x2E: // int56 / Signed 56-bit integer
+                case 0x38: // semi / Semi-precision
+                case 0x39: // single / Single precision
+                case 0x3A: // double / Double precision
+                case 0x48: // array / Array
+                case 0x49: // struct / Structure
+                case 0x50: // set / Set
+                case 0x51: // bag / Bag
+                case 0xE0: // ToD / Time of day
                 {
-                    length = 0;
+                    ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
+                    Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+                    cb->mCall(cb->mContext, EMBER_ZCL_STATUS_INVALID_VALUE);
+                    return true;
                 }
 
-                CHECK_MESSAGE_LENGTH(length);
-                Callback::Callback<StringAttributeCallback> * cb =
-                    Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-                break;
-            }
-
-            case 0x43: // octstr16 / Long octet string
-            case 0x44: // string16 / Long character string
-            {
-                // Long Strings must contains at least two bytes for the length
-                CHECK_MESSAGE_LENGTH(2);
-                uint16_t length = chip::Encoding::LittleEndian::Read16(message);
-                ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-                // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
-                if (length == 0xFFFF)
+                case 0x41: // octstr / Octet string
+                case 0x42: // string / Character string
                 {
-                    length = 0;
+                    // Short Strings must contains at least one byte for the length
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t length = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  length: 0x%02x", length);
+
+                    // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
+                    if (length == 0xFF)
+                    {
+                        length = 0;
+                    }
+
+                    CHECK_MESSAGE_LENGTH(length);
+                    Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                    break;
                 }
 
-                CHECK_MESSAGE_LENGTH(length);
-                Callback::Callback<StringAttributeCallback> * cb =
-                    Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-                break;
-            }
+                case 0x43: // octstr16 / Long octet string
+                case 0x44: // string16 / Long character string
+                {
+                    // Long Strings must contains at least two bytes for the length
+                    CHECK_MESSAGE_LENGTH(2);
+                    uint16_t length = chip::Encoding::LittleEndian::Read16(message);
+                    ChipLogProgress(Zcl, "  length: 0x%02x", length);
+
+                    // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
+                    if (length == 0xFFFF)
+                    {
+                        length = 0;
+                    }
+
+                    CHECK_MESSAGE_LENGTH(length);
+                    Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                    break;
+                }
 
-            case 0x08: // data8 / 8-bit data
-            case 0x18: // map8 / 8-bit bitmap
-            case 0x20: // uint8 / Unsigned  8-bit integer
-            case 0x30: // enum8 / 8-bit enumeration
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t value = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  value: 0x%02x", value);
+                case 0x08: // data8 / 8-bit data
+                case 0x18: // map8 / 8-bit bitmap
+                case 0x20: // uint8 / Unsigned  8-bit integer
+                case 0x30: // enum8 / 8-bit enumeration
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t value = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  value: 0x%02x", value);
 
-                Callback::Callback<Int8uAttributeCallback> * cb =
-                    Callback::Callback<Int8uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int8uAttributeCallback> * cb = Callback::Callback<Int8uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x09: // data16 / 16-bit data
-            case 0x19: // map16 / 16-bit bitmap
-            case 0x21: // uint16 / Unsigned 16-bit integer
-            case 0x31: // enum16 / 16-bit enumeration
-            case 0xE8: // clusterId / Cluster ID
-            case 0xE9: // attribId / Attribute ID
-            case 0xEA: // bacOID / BACnet OID
-            case 0xF1: // key128 / 128-bit security key
-            case 0xFF: // unk / Unknown
-            {
-                CHECK_MESSAGE_LENGTH(2);
-                uint16_t value = chip::Encoding::LittleEndian::Read16(message);
-                ChipLogProgress(Zcl, "  value: 0x%04x", value);
+                case 0x09: // data16 / 16-bit data
+                case 0x19: // map16 / 16-bit bitmap
+                case 0x21: // uint16 / Unsigned 16-bit integer
+                case 0x31: // enum16 / 16-bit enumeration
+                case 0xE8: // clusterId / Cluster ID
+                case 0xE9: // attribId / Attribute ID
+                case 0xEA: // bacOID / BACnet OID
+                case 0xF1: // key128 / 128-bit security key
+                case 0xFF: // unk / Unknown
+                {
+                    CHECK_MESSAGE_LENGTH(2);
+                    uint16_t value = chip::Encoding::LittleEndian::Read16(message);
+                    ChipLogProgress(Zcl, "  value: 0x%04x", value);
 
-                Callback::Callback<Int16uAttributeCallback> * cb =
-                    Callback::Callback<Int16uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int16uAttributeCallback> * cb = Callback::Callback<Int16uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x0B: // data32 / 32-bit data
-            case 0x1B: // map32 / 32-bit bitmap
-            case 0x23: // uint32 / Unsigned 32-bit integer
-            case 0xE1: // date / Date
-            case 0xE2: // UTC / UTCTime
-            {
-                CHECK_MESSAGE_LENGTH(4);
-                uint32_t value = chip::Encoding::LittleEndian::Read32(message);
-                ChipLogProgress(Zcl, "  value: 0x%08x", value);
+                case 0x0B: // data32 / 32-bit data
+                case 0x1B: // map32 / 32-bit bitmap
+                case 0x23: // uint32 / Unsigned 32-bit integer
+                case 0xE1: // date / Date
+                case 0xE2: // UTC / UTCTime
+                {
+                    CHECK_MESSAGE_LENGTH(4);
+                    uint32_t value = chip::Encoding::LittleEndian::Read32(message);
+                    ChipLogProgress(Zcl, "  value: 0x%08x", value);
 
-                Callback::Callback<Int32uAttributeCallback> * cb =
-                    Callback::Callback<Int32uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int32uAttributeCallback> * cb = Callback::Callback<Int32uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x0F: // data64 / 64-bit data
-            case 0x1F: // map64 / 64-bit bitmap
-            case 0x27: // uint64 / Unsigned 64-bit integer
-            case 0xF0: // EUI64 / IEEE address
-            {
-                CHECK_MESSAGE_LENGTH(8);
-                uint64_t value = chip::Encoding::LittleEndian::Read64(message);
-                ChipLogProgress(Zcl, "  value: 0x%16x", value);
+                case 0x0F: // data64 / 64-bit data
+                case 0x1F: // map64 / 64-bit bitmap
+                case 0x27: // uint64 / Unsigned 64-bit integer
+                case 0xF0: // EUI64 / IEEE address
+                {
+                    CHECK_MESSAGE_LENGTH(8);
+                    uint64_t value = chip::Encoding::LittleEndian::Read64(message);
+                    ChipLogProgress(Zcl, "  value: 0x%16x", value);
 
-                Callback::Callback<Int64uAttributeCallback> * cb =
-                    Callback::Callback<Int64uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int64uAttributeCallback> * cb = Callback::Callback<Int64uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x10: // bool / Boolean
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t value = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  value: %d", value);
+                case 0x10: // bool / Boolean
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t value = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  value: %d", value);
 
-                Callback::Callback<BooleanAttributeCallback> * cb =
-                    Callback::Callback<BooleanAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<BooleanAttributeCallback> * cb = Callback::Callback<BooleanAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x28: // int8 / Signed 8-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
-                ChipLogProgress(Zcl, "  value: %" PRId8, value);
+                case 0x28: // int8 / Signed 8-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId8, value);
 
-                Callback::Callback<Int8sAttributeCallback> * cb =
-                    Callback::Callback<Int8sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int8sAttributeCallback> * cb = Callback::Callback<Int8sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x29: // int16 / Signed 16-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(2);
-                int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
-                ChipLogProgress(Zcl, "  value: %" PRId16, value);
+                case 0x29: // int16 / Signed 16-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(2);
+                    int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId16, value);
 
-                Callback::Callback<Int16sAttributeCallback> * cb =
-                    Callback::Callback<Int16sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int16sAttributeCallback> * cb = Callback::Callback<Int16sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x2B: // int32 / Signed 32-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(4);
-                int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
-                ChipLogProgress(Zcl, "  value: %" PRId32, value);
+                case 0x2B: // int32 / Signed 32-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(4);
+                    int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId32, value);
 
-                Callback::Callback<Int32sAttributeCallback> * cb =
-                    Callback::Callback<Int32sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int32sAttributeCallback> * cb = Callback::Callback<Int32sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x2F: // int64 / Signed 64-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(8);
-                int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
-                ChipLogProgress(Zcl, "  value: %" PRId64, value);
+                case 0x2F: // int64 / Signed 64-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(8);
+                    int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId64, value);
 
-                Callback::Callback<Int64sAttributeCallback> * cb =
-                    Callback::Callback<Int64sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int64sAttributeCallback> * cb = Callback::Callback<Int64sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
             }
         }
         else
         {
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
-        // The current code is written matching the current API where there is a single attribute read
+        // The current code is written matching the current API where there is a single attribute read 
         // per read command. So if multiple attributes are read at the same time, something is wrong
         // somewhere.
         if (messageLen)
@@ -490,8 +475,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa
 
         if (status == EMBER_ZCL_STATUS_SUCCESS)
         {
-            Callback::Callback<DefaultSuccessCallback> * cb =
-                Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext);
         }
         else
@@ -500,8 +484,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa
             uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId
             ChipLogProgress(Zcl, "  attributeId: 0x%04x", attributeId);
 
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
@@ -534,8 +517,7 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me
 
         if (status == EMBER_ZCL_STATUS_SUCCESS)
         {
-            Callback::Callback<DefaultSuccessCallback> * cb =
-                Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext);
         }
         else
@@ -548,12 +530,11 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me
             uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId
             ChipLogProgress(Zcl, "  attributeId: 0x%04x", attributeId);
 
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
-        // The current code is written matching the current API where there is a single attribute report
+        // The current code is written matching the current API where there is a single attribute report 
         // per configure command. So if multiple attributes are configured at the same time, something is wrong
         // somewhere.
         if (messageLen)
@@ -600,8 +581,7 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
 
             // FIXME: unk is not supported yet.
 
-            Callback::Callback<ReadReportingConfigurationReportedCallback> * cb =
-                Callback::Callback<ReadReportingConfigurationReportedCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<ReadReportingConfigurationReportedCallback> * cb = Callback::Callback<ReadReportingConfigurationReportedCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext, minimumReportingInterval, maximumReportingInterval);
         }
         else
@@ -610,8 +590,7 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
             uint16_t timeout = chip::Encoding::LittleEndian::Read16(message); // uint16
             ChipLogProgress(Zcl, "  timeout: %" PRIu16, timeout);
 
-            Callback::Callback<ReadReportingConfigurationReceivedCallback> * cb =
-                Callback::Callback<ReadReportingConfigurationReceivedCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<ReadReportingConfigurationReceivedCallback> * cb = Callback::Callback<ReadReportingConfigurationReceivedCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext, timeout);
         }
     }
@@ -695,14 +674,12 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterLockDoorResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterLockDoorResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterLockDoorResponseCallback> * cb = Callback::Callback<DoorLockClusterLockDoorResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -716,18 +693,17 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * cb = Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
 
+
 bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen)
 {
     ChipLogProgress(Zcl, "emberAfReportAttributeCallback:");
@@ -756,203 +732,192 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin
 
         switch (attributeType)
         {
-        case 0x00: // nodata / No data
-        case 0x0A: // data24 / 24-bit data
-        case 0x0C: // data40 / 40-bit data
-        case 0x0D: // data48 / 48-bit data
-        case 0x0E: // data56 / 56-bit data
-        case 0x1A: // map24 / 24-bit bitmap
-        case 0x1C: // map40 / 40-bit bitmap
-        case 0x1D: // map48 / 48-bit bitmap
-        case 0x1E: // map56 / 56-bit bitmap
-        case 0x22: // uint24 / Unsigned 24-bit integer
-        case 0x24: // uint40 / Unsigned 40-bit integer
-        case 0x25: // uint48 / Unsigned 48-bit integer
-        case 0x26: // uint56 / Unsigned 56-bit integer
-        case 0x2A: // int24 / Signed 24-bit integer
-        case 0x2C: // int40 / Signed 40-bit integer
-        case 0x2D: // int48 / Signed 48-bit integer
-        case 0x2E: // int56 / Signed 56-bit integer
-        case 0x38: // semi / Semi-precision
-        case 0x39: // single / Single precision
-        case 0x3A: // double / Double precision
-        case 0x48: // array / Array
-        case 0x49: // struct / Structure
-        case 0x50: // set / Set
-        case 0x51: // bag / Bag
-        case 0xE0: // ToD / Time of day
-        {
-            ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
-            return true;
-        }
-
-        case 0x41: // octstr / Octet string
-        case 0x42: // string / Character string
-        {
-            // Short Strings must contains at least one byte for the length
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t length = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-            // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
-            if (length == 0xFF)
+            case 0x00: // nodata / No data
+            case 0x0A: // data24 / 24-bit data
+            case 0x0C: // data40 / 40-bit data
+            case 0x0D: // data48 / 48-bit data
+            case 0x0E: // data56 / 56-bit data
+            case 0x1A: // map24 / 24-bit bitmap
+            case 0x1C: // map40 / 40-bit bitmap
+            case 0x1D: // map48 / 48-bit bitmap
+            case 0x1E: // map56 / 56-bit bitmap
+            case 0x22: // uint24 / Unsigned 24-bit integer
+            case 0x24: // uint40 / Unsigned 40-bit integer
+            case 0x25: // uint48 / Unsigned 48-bit integer
+            case 0x26: // uint56 / Unsigned 56-bit integer
+            case 0x2A: // int24 / Signed 24-bit integer
+            case 0x2C: // int40 / Signed 40-bit integer
+            case 0x2D: // int48 / Signed 48-bit integer
+            case 0x2E: // int56 / Signed 56-bit integer
+            case 0x38: // semi / Semi-precision
+            case 0x39: // single / Single precision
+            case 0x3A: // double / Double precision
+            case 0x48: // array / Array
+            case 0x49: // struct / Structure
+            case 0x50: // set / Set
+            case 0x51: // bag / Bag
+            case 0xE0: // ToD / Time of day
             {
-                length = 0;
+                ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
+                return true;
             }
 
-            CHECK_MESSAGE_LENGTH(length);
-            Callback::Callback<StringAttributeCallback> * cb =
-                Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-            break;
-        }
+            case 0x41: // octstr / Octet string
+            case 0x42: // string / Character string
+            {
+                // Short Strings must contains at least one byte for the length
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t length = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  length: 0x%02x", length);
 
-        case 0x43: // octstr16 / Long octet string
-        case 0x44: // string16 / Long character string
-        {
-            // Long Strings must contains at least two bytes for the length
-            CHECK_MESSAGE_LENGTH(2);
-            uint16_t length = chip::Encoding::LittleEndian::Read16(message);
-            ChipLogProgress(Zcl, "  length: 0x%02x", length);
+                // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
+                if (length == 0xFF)
+                {
+                    length = 0;
+                }
 
-            // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
-            if (length == 0xFFFF)
-            {
-                length = 0;
+                CHECK_MESSAGE_LENGTH(length);
+                Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                break;
             }
 
-            CHECK_MESSAGE_LENGTH(length);
-            Callback::Callback<StringAttributeCallback> * cb =
-                Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-            break;
-        }
+            case 0x43: // octstr16 / Long octet string
+            case 0x44: // string16 / Long character string
+            {
+                // Long Strings must contains at least two bytes for the length
+                CHECK_MESSAGE_LENGTH(2);
+                uint16_t length = chip::Encoding::LittleEndian::Read16(message);
+                ChipLogProgress(Zcl, "  length: 0x%02x", length);
 
-        case 0x08: // data8 / 8-bit data
-        case 0x18: // map8 / 8-bit bitmap
-        case 0x20: // uint8 / Unsigned  8-bit integer
-        case 0x30: // enum8 / 8-bit enumeration
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t value = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  value: 0x%02x", value);
+                // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
+                if (length == 0xFFFF)
+                {
+                    length = 0;
+                }
 
-            Callback::Callback<Int8uAttributeCallback> * cb =
-                Callback::Callback<Int8uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                CHECK_MESSAGE_LENGTH(length);
+                Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                break;
+            }
 
-        case 0x09: // data16 / 16-bit data
-        case 0x19: // map16 / 16-bit bitmap
-        case 0x21: // uint16 / Unsigned 16-bit integer
-        case 0x31: // enum16 / 16-bit enumeration
-        case 0xE8: // clusterId / Cluster ID
-        case 0xE9: // attribId / Attribute ID
-        case 0xEA: // bacOID / BACnet OID
-        case 0xF1: // key128 / 128-bit security key
-        case 0xFF: // unk / Unknown
-        {
-            CHECK_MESSAGE_LENGTH(2);
-            uint16_t value = chip::Encoding::LittleEndian::Read16(message);
-            ChipLogProgress(Zcl, "  value: 0x%04x", value);
+            case 0x08: // data8 / 8-bit data
+            case 0x18: // map8 / 8-bit bitmap
+            case 0x20: // uint8 / Unsigned  8-bit integer
+            case 0x30: // enum8 / 8-bit enumeration
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t value = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  value: 0x%02x", value);
 
-            Callback::Callback<Int16uAttributeCallback> * cb =
-                Callback::Callback<Int16uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int8uAttributeCallback> * cb = Callback::Callback<Int8uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x0B: // data32 / 32-bit data
-        case 0x1B: // map32 / 32-bit bitmap
-        case 0x23: // uint32 / Unsigned 32-bit integer
-        case 0xE1: // date / Date
-        case 0xE2: // UTC / UTCTime
-        {
-            CHECK_MESSAGE_LENGTH(4);
-            uint32_t value = chip::Encoding::LittleEndian::Read32(message);
-            ChipLogProgress(Zcl, "  value: 0x%08x", value);
+            case 0x09: // data16 / 16-bit data
+            case 0x19: // map16 / 16-bit bitmap
+            case 0x21: // uint16 / Unsigned 16-bit integer
+            case 0x31: // enum16 / 16-bit enumeration
+            case 0xE8: // clusterId / Cluster ID
+            case 0xE9: // attribId / Attribute ID
+            case 0xEA: // bacOID / BACnet OID
+            case 0xF1: // key128 / 128-bit security key
+            case 0xFF: // unk / Unknown
+            {
+                CHECK_MESSAGE_LENGTH(2);
+                uint16_t value = chip::Encoding::LittleEndian::Read16(message);
+                ChipLogProgress(Zcl, "  value: 0x%04x", value);
 
-            Callback::Callback<Int32uAttributeCallback> * cb =
-                Callback::Callback<Int32uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int16uAttributeCallback> * cb = Callback::Callback<Int16uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x0F: // data64 / 64-bit data
-        case 0x1F: // map64 / 64-bit bitmap
-        case 0x27: // uint64 / Unsigned 64-bit integer
-        case 0xF0: // EUI64 / IEEE address
-        {
-            CHECK_MESSAGE_LENGTH(8);
-            uint64_t value = chip::Encoding::LittleEndian::Read64(message);
-            ChipLogProgress(Zcl, "  value: 0x%16x", value);
+            case 0x0B: // data32 / 32-bit data
+            case 0x1B: // map32 / 32-bit bitmap
+            case 0x23: // uint32 / Unsigned 32-bit integer
+            case 0xE1: // date / Date
+            case 0xE2: // UTC / UTCTime
+            {
+                CHECK_MESSAGE_LENGTH(4);
+                uint32_t value = chip::Encoding::LittleEndian::Read32(message);
+                ChipLogProgress(Zcl, "  value: 0x%08x", value);
 
-            Callback::Callback<Int64uAttributeCallback> * cb =
-                Callback::Callback<Int64uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int32uAttributeCallback> * cb = Callback::Callback<Int32uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x10: // bool / Boolean
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t value = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  value: %d", value);
+            case 0x0F: // data64 / 64-bit data
+            case 0x1F: // map64 / 64-bit bitmap
+            case 0x27: // uint64 / Unsigned 64-bit integer
+            case 0xF0: // EUI64 / IEEE address
+            {
+                CHECK_MESSAGE_LENGTH(8);
+                uint64_t value = chip::Encoding::LittleEndian::Read64(message);
+                ChipLogProgress(Zcl, "  value: 0x%16x", value);
 
-            Callback::Callback<BooleanAttributeCallback> * cb =
-                Callback::Callback<BooleanAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int64uAttributeCallback> * cb = Callback::Callback<Int64uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x28: // int8 / Signed 8-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
-            ChipLogProgress(Zcl, "  value: %" PRId8, value);
+            case 0x10: // bool / Boolean
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t value = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  value: %d", value);
 
-            Callback::Callback<Int8sAttributeCallback> * cb =
-                Callback::Callback<Int8sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<BooleanAttributeCallback> * cb = Callback::Callback<BooleanAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x29: // int16 / Signed 16-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(2);
-            int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
-            ChipLogProgress(Zcl, "  value: %" PRId16, value);
+            case 0x28: // int8 / Signed 8-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
+                ChipLogProgress(Zcl, "  value: %" PRId8, value);
 
-            Callback::Callback<Int16sAttributeCallback> * cb =
-                Callback::Callback<Int16sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int8sAttributeCallback> * cb = Callback::Callback<Int8sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x2B: // int32 / Signed 32-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(4);
-            int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
-            ChipLogProgress(Zcl, "  value: %" PRId32, value);
+            case 0x29: // int16 / Signed 16-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(2);
+                int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
+                ChipLogProgress(Zcl, "  value: %" PRId16, value);
 
-            Callback::Callback<Int32sAttributeCallback> * cb =
-                Callback::Callback<Int32sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int16sAttributeCallback> * cb = Callback::Callback<Int16sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x2F: // int64 / Signed 64-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(8);
-            int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
-            ChipLogProgress(Zcl, "  value: %" PRId64, value);
+            case 0x2B: // int32 / Signed 32-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(4);
+                int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
+                ChipLogProgress(Zcl, "  value: %" PRId32, value);
 
-            Callback::Callback<Int64sAttributeCallback> * cb =
-                Callback::Callback<Int64sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int32sAttributeCallback> * cb = Callback::Callback<Int32sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
+
+            case 0x2F: // int64 / Signed 64-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(8);
+                int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
+                ChipLogProgress(Zcl, "  value: %" PRId64, value);
+
+                Callback::Callback<Int64sAttributeCallback> * cb = Callback::Callback<Int64sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
         }
     }
 
diff --git a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.h b/examples/tv-app/tv-common/gen/CHIPClientCallbacks.h
index 2fc3557cf7582d..5853197abf53c6 100644
--- a/examples/tv-app/tv-common/gen/CHIPClientCallbacks.h
+++ b/examples/tv-app/tv-common/gen/CHIPClientCallbacks.h
@@ -35,8 +35,8 @@ typedef void (*Int32sAttributeCallback)(void * context, int32_t value);
 typedef void (*Int64uAttributeCallback)(void * context, uint64_t value);
 typedef void (*Int64sAttributeCallback)(void * context, int64_t value);
 typedef void (*StringAttributeCallback)(void * context, const chip::ByteSpan value);
-typedef void (*ReadReportingConfigurationReportedCallback)(void * context, uint16_t minInterval, uint16_t maxInterval);
-typedef void (*ReadReportingConfigurationReceivedCallback)(void * context, uint16_t timeout);
+typedef void (*ReadReportingConfigurationReportedCallback)(void* context, uint16_t minInterval, uint16_t maxInterval);
+typedef void (*ReadReportingConfigurationReceivedCallback)(void* context, uint16_t timeout);
 
 // Cluster Specific Response Callbacks
 typedef void (*DoorLockClusterLockDoorResponseCallback)(void * context);
diff --git a/examples/tv-app/tv-common/gen/CHIPClustersObjc.h b/examples/tv-app/tv-common/gen/CHIPClustersObjc.h
index 67987dd8e4f724..e10c266f971adf 100644
--- a/examples/tv-app/tv-common/gen/CHIPClustersObjc.h
+++ b/examples/tv-app/tv-common/gen/CHIPClustersObjc.h
@@ -34,17 +34,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface CHIPCluster : NSObject
 
-- (nullable instancetype)initWithDevice:(CHIPDevice *)device
-                               endpoint:(uint8_t)endpoint
-                                  queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint8_t)endpoint queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
 @end
 
+
+
 /**
  * Cluster Barrier Control
- *
+ *    
  */
 @interface CHIPBarrierControl : CHIPCluster
 
@@ -59,125 +59,47 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Color Control
- *
+ *    
  */
 @interface CHIPColorControl : CHIPCluster
 
-- (void)moveColor:(int16_t)rateX
-                rateY:(int16_t)rateY
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveColorTemperature:(uint8_t)moveMode
-                        rate:(uint16_t)rate
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler;
-- (void)moveHue:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveSaturation:(uint8_t)moveMode
-                  rate:(uint8_t)rate
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToColor:(uint16_t)colorX
-               colorY:(uint16_t)colorY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToColorTemperature:(uint16_t)colorTemperature
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToHue:(uint8_t)hue
-            direction:(uint8_t)direction
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToHueAndSaturation:(uint8_t)hue
-                    saturation:(uint8_t)saturation
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToSaturation:(uint8_t)saturation
-          transitionTime:(uint16_t)transitionTime
-             optionsMask:(uint8_t)optionsMask
-         optionsOverride:(uint8_t)optionsOverride
-       completionHandler:(ResponseHandler)completionHandler;
-- (void)stepColor:(int16_t)stepX
-                stepY:(int16_t)stepY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepColorTemperature:(uint8_t)stepMode
-                    stepSize:(uint16_t)stepSize
-              transitionTime:(uint16_t)transitionTime
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler;
-- (void)stepHue:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint8_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepSaturation:(uint8_t)stepMode
-              stepSize:(uint8_t)stepSize
-        transitionTime:(uint8_t)transitionTime
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler;
-- (void)stopMoveStep:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)moveColor:(int16_t)rateX rateY:(int16_t)rateY optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveColorTemperature:(uint8_t)moveMode rate:(uint16_t)rate colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveHue:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveSaturation:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToColor:(uint16_t)colorX colorY:(uint16_t)colorY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToColorTemperature:(uint16_t)colorTemperature transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToHue:(uint8_t)hue direction:(uint8_t)direction transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToHueAndSaturation:(uint8_t)hue saturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToSaturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepColor:(int16_t)stepX stepY:(int16_t)stepY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepColorTemperature:(uint8_t)stepMode stepSize:(uint16_t)stepSize transitionTime:(uint16_t)transitionTime colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepHue:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepSaturation:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stopMoveStep:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeCurrentHue:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentHue:(uint16_t)minInterval
-                         maxInterval:(uint16_t)maxInterval
-                              change:(uint8_t)change
-                   completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentHue:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentHue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentHue:(ResponseHandler)reportHandler;
 - (void)readAttributeCurrentSaturation:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
-                                maxInterval:(uint16_t)maxInterval
-                                     change:(uint8_t)change
-                          completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentSaturation:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentSaturation:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentSaturation:(ResponseHandler)reportHandler;
 - (void)readAttributeRemainingTime:(ResponseHandler)completionHandler;
 - (void)readAttributeCurrentX:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentX:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentX:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentX:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentX:(ResponseHandler)reportHandler;
 - (void)readAttributeCurrentY:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentY:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentY:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentY:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentY:(ResponseHandler)reportHandler;
 - (void)readAttributeDriftCompensation:(ResponseHandler)completionHandler;
 - (void)readAttributeCompensationText:(ResponseHandler)completionHandler;
 - (void)readAttributeColorTemperature:(ResponseHandler)completionHandler;
-- (void)configureAttributeColorTemperature:(uint16_t)minInterval
-                               maxInterval:(uint16_t)maxInterval
-                                    change:(uint16_t)change
-                         completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeColorTemperature:(ResponseHandler)reportHandler;
+- (void) configureAttributeColorTemperature:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeColorTemperature:(ResponseHandler)reportHandler;
 - (void)readAttributeColorMode:(ResponseHandler)completionHandler;
 - (void)readAttributeColorControlOptions:(ResponseHandler)completionHandler;
 - (void)writeAttributeColorControlOptions:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
@@ -237,9 +159,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Door Lock
- *
+ *    
  */
 @interface CHIPDoorLock : CHIPCluster
 
@@ -258,49 +182,25 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler;
 - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler;
 - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
-- (void)setHolidaySchedule:(uint8_t)scheduleId
-                localStartTime:(uint32_t)localStartTime
-                  localEndTime:(uint32_t)localEndTime
-    operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)setPin:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                  pin:(NSString *)pin
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)setRfid:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                   id:(NSString *)id
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)setHolidaySchedule:(uint8_t)scheduleId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday completionHandler:(ResponseHandler)completionHandler;
+- (void)setPin:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
+- (void)setRfid:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType id:(NSString *)id completionHandler:(ResponseHandler)completionHandler;
 - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandler:(ResponseHandler)completionHandler;
-- (void)setWeekdaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-                  daysMask:(uint8_t)daysMask
-                 startHour:(uint8_t)startHour
-               startMinute:(uint8_t)startMinute
-                   endHour:(uint8_t)endHour
-                 endMinute:(uint8_t)endMinute
-         completionHandler:(ResponseHandler)completionHandler;
-- (void)setYeardaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-            localStartTime:(uint32_t)localStartTime
-              localEndTime:(uint32_t)localEndTime
-         completionHandler:(ResponseHandler)completionHandler;
+- (void)setWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId daysMask:(uint8_t)daysMask startHour:(uint8_t)startHour startMinute:(uint8_t)startMinute endHour:(uint8_t)endHour endMinute:(uint8_t)endMinute completionHandler:(ResponseHandler)completionHandler;
+- (void)setYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime completionHandler:(ResponseHandler)completionHandler;
 - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
 - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeLockState:(ResponseHandler)completionHandler;
-- (void)configureAttributeLockState:(uint16_t)minInterval
-                        maxInterval:(uint16_t)maxInterval
-                  completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeLockState:(ResponseHandler)reportHandler;
+- (void) configureAttributeLockState:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeLockState:(ResponseHandler)reportHandler;
 - (void)readAttributeLockType:(ResponseHandler)completionHandler;
 - (void)readAttributeActuatorEnabled:(ResponseHandler)completionHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
 NS_ASSUME_NONNULL_END
 
 #endif /* CHIP_CLUSTERS_H */
diff --git a/examples/tv-app/tv-common/gen/CHIPClustersObjc.mm b/examples/tv-app/tv-common/gen/CHIPClustersObjc.mm
index fc265021c18850..0833c986c9f3e6 100644
--- a/examples/tv-app/tv-common/gen/CHIPClustersObjc.mm
+++ b/examples/tv-app/tv-common/gen/CHIPClustersObjc.mm
@@ -22,8 +22,8 @@
 #import "CHIPDevice.h"
 #import "CHIPDevice_Internal.h"
 #import "CHIPError.h"
-#import "gen/CHIPClientCallbacks.h"
 #import "gen/CHIPClustersObjc.h"
+#import "gen/CHIPClientCallbacks.h"
 
 #include <controller/CHIPClusters.h>
 #include <lib/support/Span.h>
@@ -105,17 +105,19 @@ static void CallbackFn(void * context, chip::ByteSpan value)
         CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                if (callback->mOctetString) {
-                    NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
-                    callback->mHandler(nil, @ { @"value" : data });
-                } else {
-                    NSString * str = [[NSString alloc] initWithBytes:value.data()
-                                                              length:value.size()
-                                                            encoding:NSUTF8StringEncoding];
-                    callback->mHandler(nil, @ { @"value" : str });
+                if (callback->mOctetString)
+                {
+                    NSData *data = [NSData dataWithBytes: value.data() length: value.size()];
+                    callback->mHandler(nil, @{ @"value": data });
+                }
+                else
+                {
+                    NSString * str = [[NSString alloc] initWithBytes:value.data() length:value.size() encoding:NSUTF8StringEncoding];
+                    callback->mHandler(nil, @{ @"value": str });
                 }
 
-                if (!callback->mKeepAlive) {
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -147,8 +149,9 @@ static void CallbackFn(void * context, bool value)
         CHIPBooleanAttributeCallbackBridge * callback = reinterpret_cast<CHIPBooleanAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithBool:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithBool:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -179,8 +182,9 @@ static void CallbackFn(void * context, uint8_t value)
         CHIPInt8uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt8uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedChar:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedChar:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -211,8 +215,9 @@ static void CallbackFn(void * context, int8_t value)
         CHIPInt8sAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt8sAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithChar:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithChar:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -243,8 +248,9 @@ static void CallbackFn(void * context, uint16_t value)
         CHIPInt16uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt16uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedShort:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedShort:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -275,8 +281,9 @@ static void CallbackFn(void * context, uint32_t value)
         CHIPInt32uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt32uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedLong:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedLong:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -307,8 +314,9 @@ static void CallbackFn(void * context, uint64_t value)
         CHIPInt64uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt64uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedLongLong:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedLongLong:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -339,8 +347,9 @@ static void CallbackFn(void * context, int16_t value)
         CHIPInt16sAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt16sAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithShort:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithShort:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -354,24 +363,21 @@ static void CallbackFn(void * context, int16_t value)
     bool mKeepAlive;
 };
 
-class CHIPDoorLockClusterLockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterLockDoorResponseCallback> {
+class CHIPDoorLockClusterLockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterLockDoorResponseCallback>
+{
 public:
-    CHIPDoorLockClusterLockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterLockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterLockDoorResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterLockDoorResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterLockDoorResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -383,24 +389,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterUnlockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> {
+class CHIPDoorLockClusterUnlockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>
+{
 public:
-    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterUnlockDoorResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -412,6 +415,7 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
+
 @interface CHIPCluster ()
 @property (readonly, nonatomic) dispatch_queue_t callbackQueue;
 - (Controller::ClusterBase *)getCluster;
@@ -422,7 +426,8 @@ - (instancetype)initWithDevice:(CHIPDevice *)device endpoint:(EndpointId)endpoin
 {
     if (self = [super init]) {
         Controller::ClusterBase * cppCluster = [self getCluster];
-        if (cppCluster == nullptr) {
+        if (cppCluster == nullptr)
+        {
             return nil;
         }
 
@@ -442,6 +447,8 @@ - (instancetype)initWithDevice:(CHIPDevice *)device endpoint:(EndpointId)endpoin
 }
 @end
 
+
+
 @interface CHIPBarrierControl ()
 @property (readonly) Controller::BarrierControlCluster cppCluster;
 @end
@@ -613,8 +620,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPColorControl ()
 @property (readonly) Controller::ColorControlCluster cppCluster;
 @end
@@ -626,11 +635,7 @@ @implementation CHIPColorControl
     return &_cppCluster;
 }
 
-- (void)moveColor:(int16_t)rateX
-                rateY:(int16_t)rateY
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveColor:(int16_t)rateX rateY:(int16_t)rateY optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -645,21 +650,14 @@ - (void)moveColor:(int16_t)rateX
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveColorTemperature:(uint8_t)moveMode
-                        rate:(uint16_t)rate
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler
+- (void)moveColorTemperature:(uint8_t)moveMode rate:(uint16_t)rate colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -674,19 +672,14 @@ - (void)moveColorTemperature:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate,
-        colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveHue:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveHue:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -701,19 +694,14 @@ - (void)moveHue:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveHue(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveHue(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveSaturation:(uint8_t)moveMode
-                  rate:(uint8_t)rate
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler
+- (void)moveSaturation:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -728,20 +716,14 @@ - (void)moveSaturation:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveSaturation(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveSaturation(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToColor:(uint16_t)colorX
-               colorY:(uint16_t)colorY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToColor:(uint16_t)colorX colorY:(uint16_t)colorY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -756,19 +738,14 @@ - (void)moveToColor:(uint16_t)colorX
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToColor(
-        onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToColor(onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToColorTemperature:(uint16_t)colorTemperature
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler
+- (void)moveToColorTemperature:(uint16_t)colorTemperature transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -783,20 +760,14 @@ - (void)moveToColorTemperature:(uint16_t)colorTemperature
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToColorTemperature(
-        onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToHue:(uint8_t)hue
-            direction:(uint8_t)direction
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToHue:(uint8_t)hue direction:(uint8_t)direction transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -811,20 +782,14 @@ - (void)moveToHue:(uint8_t)hue
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToHue(
-        onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToHueAndSaturation:(uint8_t)hue
-                    saturation:(uint8_t)saturation
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler
+- (void)moveToHueAndSaturation:(uint8_t)hue saturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -839,19 +804,14 @@ - (void)moveToHueAndSaturation:(uint8_t)hue
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToHueAndSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToSaturation:(uint8_t)saturation
-          transitionTime:(uint16_t)transitionTime
-             optionsMask:(uint8_t)optionsMask
-         optionsOverride:(uint8_t)optionsOverride
-       completionHandler:(ResponseHandler)completionHandler
+- (void)moveToSaturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -866,20 +826,14 @@ - (void)moveToSaturation:(uint8_t)saturation
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToSaturation(onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepColor:(int16_t)stepX
-                stepY:(int16_t)stepY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepColor:(int16_t)stepX stepY:(int16_t)stepY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -894,22 +848,14 @@ - (void)stepColor:(int16_t)stepX
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepColor(
-        onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepColor(onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepColorTemperature:(uint8_t)stepMode
-                    stepSize:(uint16_t)stepSize
-              transitionTime:(uint16_t)transitionTime
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler
+- (void)stepColorTemperature:(uint8_t)stepMode stepSize:(uint16_t)stepSize transitionTime:(uint16_t)transitionTime colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -924,20 +870,14 @@ - (void)stepColorTemperature:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize,
-        transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepHue:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint8_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepHue:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -952,20 +892,14 @@ - (void)stepHue:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepHue(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepSaturation:(uint8_t)stepMode
-              stepSize:(uint8_t)stepSize
-        transitionTime:(uint8_t)transitionTime
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler
+- (void)stepSaturation:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -980,17 +914,14 @@ - (void)stepSaturation:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stopMoveStep:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stopMoveStep:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -1036,10 +967,7 @@ - (void)readAttributeCurrentHue:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentHue:(uint16_t)minInterval
-                         maxInterval:(uint16_t)maxInterval
-                              change:(uint8_t)change
-                   completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentHue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -1054,8 +982,8 @@ - (void)configureAttributeCurrentHue:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -1063,7 +991,7 @@ - (void)configureAttributeCurrentHue:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentHue:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentHue:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -1101,10 +1029,7 @@ - (void)readAttributeCurrentSaturation:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
-                                maxInterval:(uint16_t)maxInterval
-                                     change:(uint8_t)change
-                          completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentSaturation:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -1119,8 +1044,8 @@ - (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -1128,7 +1053,7 @@ - (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentSaturation:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentSaturation:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -1189,10 +1114,7 @@ - (void)readAttributeCurrentX:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentX:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentX:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -1207,8 +1129,8 @@ - (void)configureAttributeCurrentX:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -1216,7 +1138,7 @@ - (void)configureAttributeCurrentX:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentX:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentX:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -1254,10 +1176,7 @@ - (void)readAttributeCurrentY:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentY:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentY:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -1272,8 +1191,8 @@ - (void)configureAttributeCurrentY:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -1281,7 +1200,7 @@ - (void)configureAttributeCurrentY:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentY:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentY:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -1321,8 +1240,7 @@ - (void)readAttributeDriftCompensation:(ResponseHandler)completionHandler
 
 - (void)readAttributeCompensationText:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -1366,10 +1284,7 @@ - (void)readAttributeColorTemperature:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeColorTemperature:(uint16_t)minInterval
-                               maxInterval:(uint16_t)maxInterval
-                                    change:(uint16_t)change
-                         completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeColorTemperature:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -1384,8 +1299,8 @@ - (void)configureAttributeColorTemperature:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeColorTemperature(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -1393,7 +1308,7 @@ - (void)configureAttributeColorTemperature:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeColorTemperature:(ResponseHandler)reportHandler
+- (void) reportAttributeColorTemperature:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -1470,7 +1385,7 @@ - (void)writeAttributeColorControlOptions:(uint8_t)value completionHandler:(Resp
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorControlOptions(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -1953,7 +1868,7 @@ - (void)writeAttributeWhitePointX:(uint16_t)value completionHandler:(ResponseHan
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeWhitePointX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -1999,7 +1914,7 @@ - (void)writeAttributeWhitePointY:(uint16_t)value completionHandler:(ResponseHan
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeWhitePointY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2045,7 +1960,7 @@ - (void)writeAttributeColorPointRX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2091,7 +2006,7 @@ - (void)writeAttributeColorPointRY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2137,7 +2052,7 @@ - (void)writeAttributeColorPointRIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2183,7 +2098,7 @@ - (void)writeAttributeColorPointGX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2229,7 +2144,7 @@ - (void)writeAttributeColorPointGY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2275,7 +2190,7 @@ - (void)writeAttributeColorPointGIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2321,7 +2236,7 @@ - (void)writeAttributeColorPointBX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2367,7 +2282,7 @@ - (void)writeAttributeColorPointBY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2413,7 +2328,7 @@ - (void)writeAttributeColorPointBIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2666,7 +2581,7 @@ - (void)writeAttributeStartUpColorTemperatureMireds:(uint16_t)value completionHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -2696,8 +2611,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPDoorLock ()
 @property (readonly) Controller::DoorLockCluster cppCluster;
 @end
@@ -3019,8 +2936,7 @@ - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completio
 }
 - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterLockDoorResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterLockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterLockDoorResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterLockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -3033,20 +2949,14 @@ - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHa
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.LockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.LockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setHolidaySchedule:(uint8_t)scheduleId
-                localStartTime:(uint32_t)localStartTime
-                  localEndTime:(uint32_t)localEndTime
-    operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday
-             completionHandler:(ResponseHandler)completionHandler
+- (void)setHolidaySchedule:(uint8_t)scheduleId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3061,19 +2971,14 @@ - (void)setHolidaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetHolidaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+    CHIP_ERROR err = self.cppCluster.SetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setPin:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                  pin:(NSString *)pin
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setPin:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3088,20 +2993,14 @@ - (void)setPin:(uint16_t)userId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setRfid:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                   id:(NSString *)id
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setRfid:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType id:(NSString *)id completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3116,9 +3015,7 @@ - (void)setRfid:(uint16_t)userId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-        chip::ByteSpan((const uint8_t *) [id dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*)[id dataUsingEncoding:NSUTF8StringEncoding].bytes, [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3147,14 +3044,7 @@ - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandle
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setWeekdaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-                  daysMask:(uint8_t)daysMask
-                 startHour:(uint8_t)startHour
-               startMinute:(uint8_t)startMinute
-                   endHour:(uint8_t)endHour
-                 endMinute:(uint8_t)endMinute
-         completionHandler:(ResponseHandler)completionHandler
+- (void)setWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId daysMask:(uint8_t)daysMask startHour:(uint8_t)startHour startMinute:(uint8_t)startMinute endHour:(uint8_t)endHour endMinute:(uint8_t)endMinute completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3169,19 +3059,14 @@ - (void)setWeekdaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetWeekdaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+    CHIP_ERROR err = self.cppCluster.SetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setYeardaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-            localStartTime:(uint32_t)localStartTime
-              localEndTime:(uint32_t)localEndTime
-         completionHandler:(ResponseHandler)completionHandler
+- (void)setYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3196,8 +3081,7 @@ - (void)setYeardaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetYeardaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
+    CHIP_ERROR err = self.cppCluster.SetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3206,8 +3090,7 @@ - (void)setYeardaySchedule:(uint8_t)scheduleId
 }
 - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -3220,9 +3103,7 @@ - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completion
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3244,9 +3125,7 @@ - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin complet
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds,
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds, chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3277,9 +3156,7 @@ - (void)readAttributeLockState:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeLockState:(uint16_t)minInterval
-                        maxInterval:(uint16_t)maxInterval
-                  completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeLockState:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3294,8 +3171,8 @@ - (void)configureAttributeLockState:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3303,7 +3180,7 @@ - (void)configureAttributeLockState:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeLockState:(ResponseHandler)reportHandler
+- (void) reportAttributeLockState:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -3343,8 +3220,7 @@ - (void)readAttributeLockType:(ResponseHandler)completionHandler
 
 - (void)readAttributeActuatorEnabled:(ResponseHandler)completionHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onSuccess
-        = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPBooleanAttributeCallbackBridge * onSuccess = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -3388,4 +3264,6 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
+
diff --git a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp
index 7df2f074d470f1..fbb01bee8ddd82 100644
--- a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp
+++ b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,75 +47,73 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t percentOpen;
-            bool percentOpenExists      = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (percentOpenExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(percentOpen);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        percentOpenExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t percentOpen;
+bool percentOpenExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (percentOpenExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: {
+      }
+      TLVUnpackError = dataTlv.Get(percentOpen);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            percentOpenExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfBarrierControlClusterBarrierControlStopCallback();
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
+        case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfBarrierControlClusterBarrierControlStopCallback();
+                    break;
+        }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
@@ -126,7 +124,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace BarrierControl
+}
 
 namespace ColorControl {
 
@@ -136,5877 +134,5751 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_MOVE_COLOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            int16_t rateX;
-            bool rateXExists = false;
-            int16_t rateY;
-            bool rateYExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (rateXExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rateX);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateXExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateYExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rateY);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateYExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+int16_t rateX;
+bool rateXExists = false;
+int16_t rateY;
+bool rateYExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (rateXExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint16_t rate;
-            bool rateExists = false;
-            uint16_t colorTemperatureMinimum;
-            bool colorTemperatureMinimumExists = false;
-            uint16_t colorTemperatureMaximum;
-            bool colorTemperatureMaximumExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (colorTemperatureMinimumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMinimumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (colorTemperatureMaximumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMaximumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum,
-                                                                       colorTemperatureMaximum, optionsMask, optionsOverride);
-            }
-            else if (6 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(rateX);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateXExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateYExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_HUE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(rateY);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateYExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
         }
-        case ZCL_MOVE_TO_COLOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t colorX;
-            bool colorXExists = false;
-            uint16_t colorY;
-            bool colorYExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (colorXExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorX);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorXExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (colorYExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorY);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorYExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t colorTemperature;
-            bool colorTemperatureExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (colorTemperatureExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperature);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask,
-                                                                         optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint16_t rate;
+bool rateExists = false;
+uint16_t colorTemperatureMinimum;
+bool colorTemperatureMinimumExists = false;
+uint16_t colorTemperatureMaximum;
+bool colorTemperatureMaximumExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_TO_HUE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t hue;
-            bool hueExists = false;
-            uint8_t direction;
-            bool directionExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (hueExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(hue);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        hueExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (directionExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(direction);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        directionExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t hue;
-            bool hueExists = false;
-            uint8_t saturation;
-            bool saturationExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (hueExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(hue);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        hueExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (saturationExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(saturation);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        saturationExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask,
-                                                                         optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (colorTemperatureMinimumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_TO_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t saturation;
-            bool saturationExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (saturationExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(saturation);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        saturationExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMinimumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (colorTemperatureMaximumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STEP_COLOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            int16_t stepX;
-            bool stepXExists = false;
-            int16_t stepY;
-            bool stepYExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepXExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepX);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepXExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepYExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepY);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepYExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMaximumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint16_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint16_t colorTemperatureMinimum;
-            bool colorTemperatureMinimumExists = false;
-            uint16_t colorTemperatureMaximum;
-            bool colorTemperatureMaximumExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (colorTemperatureMinimumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMinimumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (colorTemperatureMaximumExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        colorTemperatureMaximumExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum,
-                                                                       colorTemperatureMaximum, optionsMask, optionsOverride);
-            }
-            else if (7 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
         }
-        case ZCL_STEP_HUE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint8_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+else if (6 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6, validArgumentCount);
+}
             break;
         }
-        case ZCL_STEP_SATURATION_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint8_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_HUE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STOP_MOVE_STEP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t optionsMask;
-            bool optionsMaskExists = false;
-            uint8_t optionsOverride;
-            bool optionsOverrideExists  = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (optionsMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (optionsOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionsOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionsOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_COLOR_CONTROL_CLUSTER_ID);
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        }
-    }
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace ColorControl
-
-namespace DoorLock {
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-void DispatchClientCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterLockDoorResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
-            break;
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
         }
-        case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockDoorResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_DOOR_LOCK_CLUSTER_ID);
+        case ZCL_MOVE_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        }
-    }
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace DoorLock
-
-namespace DoorLock {
-
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+if (CHIP_END_OF_TLV == TLVError)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_CLEAR_ALL_PINS_COMMAND_ID: {
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfDoorLockClusterClearAllPinsCallback();
-            break;
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
         }
-        case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfDoorLockClusterClearAllRfidsCallback();
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists       = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_TO_COLOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t colorX;
+bool colorXExists = false;
+uint16_t colorY;
+bool colorYExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (colorXExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_CLEAR_PIN_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearPinCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(colorX);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorXExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (colorYExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_CLEAR_RFID_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearRfidCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(colorY);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorYExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
         }
-        case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists       = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_LOG_RECORD_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t logIndex;
-            bool logIndexExists         = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (logIndexExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(logIndex);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        logIndexExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetLogRecordCallback(logIndex);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t colorTemperature;
+bool colorTemperatureExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (colorTemperatureExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperature);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, optionsOverride);
         }
-        case ZCL_GET_PIN_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetPinCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_RFID_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetRfidCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_TO_HUE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t hue;
+bool hueExists = false;
+uint8_t direction;
+bool directionExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (hueExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(hue);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            hueExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (directionExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(direction);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            directionExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
         }
-        case ZCL_GET_USER_TYPE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetUserTypeCallback(userId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t hue;
+bool hueExists = false;
+uint8_t saturation;
+bool saturationExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (hueExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(hue);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            hueExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (saturationExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(saturation);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            saturationExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, optionsOverride);
         }
-        case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
-        case ZCL_LOCK_DOOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            const uint8_t * PIN;
-            bool PINExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (PINExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(PIN);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        PINExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterLockDoorCallback(const_cast<uint8_t *>(PIN));
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_MOVE_TO_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t saturation;
+bool saturationExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (saturationExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(saturation);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            saturationExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
         }
-        case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists = false;
-            uint8_t operatingModeDuringHoliday;
-            bool operatingModeDuringHolidayExists = false;
-            uint32_t validArgumentCount           = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (operatingModeDuringHolidayExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operatingModeDuringHolidayExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime,
-                                                                 operatingModeDuringHoliday);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_SET_PIN_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, const_cast<uint8_t *>(pin));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        case ZCL_STEP_COLOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+int16_t stepX;
+bool stepXExists = false;
+int16_t stepY;
+bool stepYExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepXExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepX);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepXExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepYExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(stepY);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepYExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
         }
-        case ZCL_SET_RFID_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * id;
-            bool idExists               = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (idExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(id);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        idExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, const_cast<uint8_t *>(id));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
-        case ZCL_SET_USER_TYPE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userType;
-            bool userTypeExists         = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint16_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint16_t colorTemperatureMinimum;
+bool colorTemperatureMinimumExists = false;
+uint16_t colorTemperatureMaximum;
+bool colorTemperatureMaximumExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (colorTemperatureMinimumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMinimum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMinimumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (colorTemperatureMaximumExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(colorTemperatureMaximum);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            colorTemperatureMaximumExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
         }
-        case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t daysMask;
-            bool daysMaskExists = false;
-            uint8_t startHour;
-            bool startHourExists = false;
-            uint8_t startMinute;
-            bool startMinuteExists = false;
-            uint8_t endHour;
-            bool endHourExists = false;
-            uint8_t endMinute;
-            bool endMinuteExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (daysMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(daysMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        daysMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (startHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (startMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (endHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (endMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour,
-                                                                 endMinute);
-            }
-            else if (7 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7,
-                                validArgumentCount);
-            }
+else if (7 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7, validArgumentCount);
+}
             break;
         }
-        case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists     = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        case ZCL_STEP_HUE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint8_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
         }
-        case ZCL_UNLOCK_DOOR_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            const uint8_t * PIN;
-            bool PINExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (PINExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(PIN);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        PINExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockDoorCallback(const_cast<uint8_t *>(PIN));
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
-        case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t timeoutInSeconds;
-            bool timeoutInSecondsExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutInSecondsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutInSeconds);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutInSecondsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, const_cast<uint8_t *>(pin));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_STEP_SATURATION_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint8_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STOP_MOVE_STEP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t optionsMask;
+bool optionsMaskExists = false;
+uint8_t optionsOverride;
+bool optionsOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (optionsMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (optionsOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionsOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionsOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_DOOR_LOCK_CLUSTER_ID);
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_COLOR_CONTROL_CLUSTER_ID);
             break;
         }
         }
-    }
+    }
+}
+
+}
+
+namespace DoorLock {
+
+void DispatchClientCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterLockDoorResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockDoorResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_DOOR_LOCK_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace DoorLock {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_CLEAR_ALL_PINS_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllPinsCallback();
+                    break;
+        }
+        case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllRfidsCallback();
+                    break;
+        }
+        case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_PIN_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearPinCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_RFID_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearRfidCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_LOG_RECORD_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t logIndex;
+bool logIndexExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (logIndexExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(logIndex);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            logIndexExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetLogRecordCallback(logIndex);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_PIN_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetPinCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_RFID_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetRfidCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_USER_TYPE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetUserTypeCallback(userId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_LOCK_DOOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+const uint8_t * PIN;
+bool PINExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (PINExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(PIN);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            PINExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterLockDoorCallback(const_cast<uint8_t*>(PIN));
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint8_t operatingModeDuringHoliday;
+bool operatingModeDuringHolidayExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (operatingModeDuringHolidayExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operatingModeDuringHolidayExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_PIN_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, const_cast<uint8_t*>(pin));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_RFID_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * id;
+bool idExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (idExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(id);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            idExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, const_cast<uint8_t*>(id));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_USER_TYPE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t daysMask;
+bool daysMaskExists = false;
+uint8_t startHour;
+bool startHourExists = false;
+uint8_t startMinute;
+bool startMinuteExists = false;
+uint8_t endHour;
+bool endHourExists = false;
+uint8_t endMinute;
+bool endMinuteExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (daysMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(daysMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            daysMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (startHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (startMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (endHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (endMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+        }
+else if (7 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_UNLOCK_DOOR_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+const uint8_t * PIN;
+bool PINExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (PINExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(PIN);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            PINExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockDoorCallback(const_cast<uint8_t*>(PIN));
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t timeoutInSeconds;
+bool timeoutInSecondsExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutInSecondsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutInSeconds);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutInSecondsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, const_cast<uint8_t*>(pin));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_DOOR_LOCK_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace Groups {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_ADD_GROUP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+const uint8_t * groupName;
+bool groupNameExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(groupName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterAddGroupCallback(groupId, const_cast<uint8_t*>(groupName));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+const uint8_t * groupName;
+bool groupNameExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(groupName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, const_cast<uint8_t*>(groupName));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t groupCount;
+bool groupCountExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
+bool groupListExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupCountExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupCount);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupCountExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupListExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupListExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterRemoveAllGroupsCallback();
+                    break;
+        }
+        case ZCL_REMOVE_GROUP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterRemoveGroupCallback(groupId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_VIEW_GROUP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterViewGroupCallback(groupId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_GROUPS_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace IasZone {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t enrollResponseCode;
+bool enrollResponseCodeExists = false;
+uint8_t zoneId;
+bool zoneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (enrollResponseCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(enrollResponseCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            enrollResponseCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (zoneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(zoneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            zoneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IAS_ZONE_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace Identify {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_IDENTIFY_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t identifyTime;
+bool identifyTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (identifyTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(identifyTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            identifyTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIdentifyClusterIdentifyCallback(identifyTime);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_IDENTIFY_QUERY_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIdentifyClusterIdentifyQueryCallback();
+                    break;
+        }
+        default: {
+            // Unrecognized command ID, error status will apply.
+            // TODO: Encode response for command not found
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IDENTIFY_CLUSTER_ID);
+            break;
+        }
+        }
+    }
+}
+
+}
+
+namespace LevelControl {
+
+void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+{
+    {
+        switch (commandId)
+        {
+        case ZCL_MOVE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t level;
+bool levelExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (levelExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(level);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            levelExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t moveMode;
+bool moveModeExists = false;
+uint8_t rate;
+bool rateExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (moveModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(moveMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            moveModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (rateExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(rate);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rateExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STEP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t stepMode;
+bool stepModeExists = false;
+uint8_t stepSize;
+bool stepSizeExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (stepModeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepMode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepModeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (stepSizeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(stepSize);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            stepSizeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace DoorLock
-
-namespace Groups {
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_ADD_GROUP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            const uint8_t * groupName;
-            bool groupNameExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(groupName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterAddGroupCallback(groupId, const_cast<uint8_t *>(groupName));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
-            break;
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
         }
-        case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            const uint8_t * groupName;
-            bool groupNameExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(groupName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, const_cast<uint8_t *>(groupName));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t groupCount;
-            bool groupCountExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
-            bool groupListExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupCountExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupCount);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupCountExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupListExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupListExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_STOP_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t optionMask;
+bool optionMaskExists = false;
+uint8_t optionOverride;
+bool optionOverrideExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (optionMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfGroupsClusterRemoveAllGroupsCallback();
+      }
+      TLVUnpackError = dataTlv.Get(optionMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (optionOverrideExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(optionOverride);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            optionOverrideExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
         }
-        case ZCL_REMOVE_GROUP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterRemoveGroupCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
-        case ZCL_VIEW_GROUP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLevelControlClusterStopWithOnOffCallback();
                     break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterViewGroupCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
-            break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_GROUPS_CLUSTER_ID);
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LEVEL_CONTROL_CLUSTER_ID);
             break;
         }
         }
     }
 }
 
-} // namespace Groups
+}
 
-namespace IasZone {
+namespace LowPower {
 
 void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
 {
     {
         switch (commandId)
         {
-        case ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t enrollResponseCode;
-            bool enrollResponseCodeExists = false;
-            uint8_t zoneId;
-            bool zoneIdExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (enrollResponseCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(enrollResponseCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        enrollResponseCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (zoneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(zoneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        zoneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+        case ZCL_SLEEP_COMMAND_ID: {
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfLowPowerClusterSleepCallback();
                     break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
-            break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
             // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IAS_ZONE_CLUSTER_ID);
+            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LOW_POWER_CLUSTER_ID);
             break;
         }
         }
     }
 }
 
-} // namespace IasZone
+}
 
-namespace Identify {
+namespace NetworkCommissioning {
 
 void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
 {
     {
         switch (commandId)
         {
-        case ZCL_IDENTIFY_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t identifyTime;
-            bool identifyTimeExists     = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (identifyTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(identifyTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        identifyTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfIdentifyClusterIdentifyCallback(identifyTime);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_IDENTIFY_QUERY_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfIdentifyClusterIdentifyQueryCallback();
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_IDENTIFY_CLUSTER_ID);
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
         }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
+            break;
         }
+        case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
     }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace Identify
-
-namespace LevelControl {
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_MOVE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
-            break;
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
         }
-        case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
-        case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t level;
-            bool levelExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (levelExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(level);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        levelExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_DISABLE_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t moveMode;
-            bool moveModeExists = false;
-            uint8_t rate;
-            bool rateExists             = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (moveModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(moveMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        moveModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (rateExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(rate);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rateExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STEP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
         }
-        case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t stepMode;
-            bool stepModeExists = false;
-            uint8_t stepSize;
-            bool stepSizeExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (stepModeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepMode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepModeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (stepSizeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(stepSize);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        stepSizeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_STOP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t optionMask;
-            bool optionMaskExists = false;
-            uint8_t optionOverride;
-            bool optionOverrideExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (optionMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (optionOverrideExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(optionOverride);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        optionOverrideExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        case ZCL_ENABLE_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan networkID;
+bool networkIDExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (networkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        networkID = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            networkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfLevelControlClusterStopWithOnOffCallback();
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LEVEL_CONTROL_CLUSTER_ID);
+        case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
         }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
         }
+        case ZCL_REMOVE_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan NetworkID;
+bool NetworkIDExists = false;
+uint64_t Breadcrumb;
+bool BreadcrumbExists = false;
+uint32_t TimeoutMs;
+bool TimeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (NetworkIDExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        NetworkID = chip::ByteSpan(data, dataTlv.GetLength());
     }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            NetworkIDExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (BreadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(Breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            BreadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (TimeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(TimeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            TimeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace LevelControl
-
-namespace LowPower {
-
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+if (CHIP_END_OF_TLV == TLVError)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_SLEEP_COMMAND_ID: {
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfLowPowerClusterSleepCallback();
-            break;
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
         }
-        default: {
-            // Unrecognized command ID, error status will apply.
-            // TODO: Encode response for command not found
-            ChipLogError(Zcl, "Unknown command %" PRIx16 " for cluster %" PRIx16, commandId, ZCL_LOW_POWER_CLUSTER_ID);
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        }
+        case ZCL_SCAN_NETWORKS_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
     }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
 }
 
-} // namespace LowPower
-
-namespace NetworkCommissioning {
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
 
-void DispatchServerCommand(app::Command * command, CommandId commandId, EndpointId endpointId, TLV::TLVReader & dataTlv)
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
 {
-    {
-        switch (commandId)
-        {
-        case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
-            break;
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
         }
-        case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan operationalDataset;
+bool operationalDatasetExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (operationalDatasetExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan networkID;
-            bool networkIDExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (networkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        networkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        networkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        operationalDataset = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operationalDatasetExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
         }
-        case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan NetworkID;
-            bool NetworkIDExists = false;
-            uint64_t Breadcrumb;
-            bool BreadcrumbExists = false;
-            uint32_t TimeoutMs;
-            bool TimeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (NetworkIDExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        NetworkID            = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        NetworkIDExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (BreadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(Breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        BreadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (TimeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(TimeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        TimeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
-        case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+chip::ByteSpan ssid;
+bool ssidExists = false;
+chip::ByteSpan credentials;
+bool credentialsExists = false;
+uint64_t breadcrumb;
+bool breadcrumbExists = false;
+uint32_t timeoutMs;
+bool timeoutMsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (ssidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
-        }
-        case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan operationalDataset;
-            bool operationalDatasetExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (operationalDatasetExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        operationalDataset   = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operationalDatasetExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        ssid = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            ssidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (credentialsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+    {
+        const uint8_t * data = nullptr;
+        TLVUnpackError = dataTlv.GetDataPtr(data);
+        credentials = chip::ByteSpan(data, dataTlv.GetLength());
+    }
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            credentialsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (breadcrumbExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(breadcrumb);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            breadcrumbExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (timeoutMsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(timeoutMs);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutMsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
         }
-        case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            chip::ByteSpan ssid;
-            bool ssidExists = false;
-            chip::ByteSpan credentials;
-            bool credentialsExists = false;
-            uint64_t breadcrumb;
-            bool breadcrumbExists = false;
-            uint32_t timeoutMs;
-            bool timeoutMsExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (ssidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        ssid                 = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        ssidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (credentialsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    {
-                        const uint8_t * data = nullptr;
-                        TLVUnpackError       = dataTlv.GetDataPtr(data);
-                        credentials          = chip::ByteSpan(data, dataTlv.GetLength());
-                    }
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        credentialsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (breadcrumbExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(breadcrumb);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        breadcrumbExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (timeoutMsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeoutMs);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutMsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         default: {
@@ -6019,7 +5891,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace NetworkCommissioning
+}
 
 namespace OnOff {
 
@@ -6029,22 +5901,22 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOffCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOffCallback();
+                    break;
         }
         case ZCL_ON_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterOnCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterOnCallback();
+                    break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-
-            // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-            emberAfOnOffClusterToggleCallback();
-            break;
+        
+        // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfOnOffClusterToggleCallback();
+                    break;
         }
         default: {
             // Unrecognized command ID, error status will apply.
@@ -6056,7 +5928,7 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace OnOff
+}
 
 namespace Scenes {
 
@@ -6066,598 +5938,583 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            const uint8_t * sceneName;
-            bool sceneNameExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-            bool extensionFieldSetsExists = false;
-            uint32_t validArgumentCount   = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (sceneNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(sceneName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (extensionFieldSetsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        extensionFieldSetsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, const_cast<uint8_t *>(sceneName),
-                                                     extensionFieldSets);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+const uint8_t * sceneName;
+bool sceneNameExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+bool extensionFieldSetsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (sceneNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(sceneName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (extensionFieldSetsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            extensionFieldSetsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, const_cast<uint8_t*>(sceneName), extensionFieldSets);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterGetSceneMembershipCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterGetSceneMembershipCallback(groupId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_RECALL_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists   = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveAllScenesCallback(groupId);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveAllScenesCallback(groupId);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_STORE_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_VIEW_SCENE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterViewSceneCallback(groupId, sceneId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterViewSceneCallback(groupId, sceneId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         default: {
@@ -6670,49 +6527,50 @@ void DispatchServerCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Scenes
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
-    case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+    case ZCL_BARRIER_CONTROL_CLUSTER_ID :
         clusters::BarrierControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+    case ZCL_COLOR_CONTROL_CLUSTER_ID :
         clusters::ColorControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_DOOR_LOCK_CLUSTER_ID:
+    case ZCL_DOOR_LOCK_CLUSTER_ID :
         clusters::DoorLock::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_GROUPS_CLUSTER_ID:
+    case ZCL_GROUPS_CLUSTER_ID :
         clusters::Groups::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_IAS_ZONE_CLUSTER_ID:
+    case ZCL_IAS_ZONE_CLUSTER_ID :
         clusters::IasZone::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_IDENTIFY_CLUSTER_ID:
+    case ZCL_IDENTIFY_CLUSTER_ID :
         clusters::Identify::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+    case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         clusters::LevelControl::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_LOW_POWER_CLUSTER_ID:
+    case ZCL_LOW_POWER_CLUSTER_ID :
         clusters::LowPower::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         clusters::NetworkCommissioning::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+    case ZCL_ON_OFF_CLUSTER_ID :
         clusters::OnOff::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
-    case ZCL_SCENES_CLUSTER_ID:
+    case ZCL_SCENES_CLUSTER_ID :
         clusters::Scenes::DispatchServerCommand(apCommandObj, aCommandId, aEndPointId, aReader);
         break;
     default:
diff --git a/examples/tv-app/tv-common/gen/af-structs.h b/examples/tv-app/tv-common/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/examples/tv-app/tv-common/gen/af-structs.h
+++ b/examples/tv-app/tv-common/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/examples/tv-app/tv-common/gen/attribute-id.h b/examples/tv-app/tv-common/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/examples/tv-app/tv-common/gen/attribute-id.h
+++ b/examples/tv-app/tv-common/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/examples/tv-app/tv-common/gen/attribute-size.h b/examples/tv-app/tv-common/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/examples/tv-app/tv-common/gen/attribute-size.h
+++ b/examples/tv-app/tv-common/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/examples/tv-app/tv-common/gen/attribute-type.h b/examples/tv-app/tv-common/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/examples/tv-app/tv-common/gen/attribute-type.h
+++ b/examples/tv-app/tv-common/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/examples/tv-app/tv-common/gen/call-command-handler.cpp b/examples/tv-app/tv-common/gen/call-command-handler.cpp
index ed2bbd6f958b38..362693d994178d 100644
--- a/examples/tv-app/tv-common/gen/call-command-handler.cpp
+++ b/examples/tv-app/tv-common/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -46,6 +46,7 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd)
 EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfTemperatureMeasurementClusterServerCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -66,6 +67,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -75,15 +77,15 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+        case ZCL_BARRIER_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Barrier Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_COLOR_CONTROL_CLUSTER_ID:
+        case ZCL_COLOR_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Color Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_DOOR_LOCK_CLUSTER_ID:
+        case ZCL_DOOR_LOCK_CLUSTER_ID :
             result = emberAfDoorLockClusterClientCommandParse(cmd);
             break;
         default:
@@ -96,48 +98,48 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+        case ZCL_APPLICATION_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Application Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+        case ZCL_BARRIER_CONTROL_CLUSTER_ID :
             result = emberAfBarrierControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_COLOR_CONTROL_CLUSTER_ID:
+        case ZCL_COLOR_CONTROL_CLUSTER_ID :
             result = emberAfColorControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_DOOR_LOCK_CLUSTER_ID:
+        case ZCL_DOOR_LOCK_CLUSTER_ID :
             result = emberAfDoorLockClusterServerCommandParse(cmd);
             break;
-        case ZCL_GROUPS_CLUSTER_ID:
+        case ZCL_GROUPS_CLUSTER_ID :
             result = emberAfGroupsClusterServerCommandParse(cmd);
             break;
-        case ZCL_IAS_ZONE_CLUSTER_ID:
+        case ZCL_IAS_ZONE_CLUSTER_ID :
             result = emberAfIasZoneClusterServerCommandParse(cmd);
             break;
-        case ZCL_IDENTIFY_CLUSTER_ID:
+        case ZCL_IDENTIFY_CLUSTER_ID :
             result = emberAfIdentifyClusterServerCommandParse(cmd);
             break;
-        case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        case ZCL_LEVEL_CONTROL_CLUSTER_ID :
             result = emberAfLevelControlClusterServerCommandParse(cmd);
             break;
-        case ZCL_LOW_POWER_CLUSTER_ID:
+        case ZCL_LOW_POWER_CLUSTER_ID :
             result = emberAfLowPowerClusterServerCommandParse(cmd);
             break;
-        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+        case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
             result = emberAfNetworkCommissioningClusterServerCommandParse(cmd);
             break;
-        case ZCL_ON_OFF_CLUSTER_ID:
+        case ZCL_ON_OFF_CLUSTER_ID :
             result = emberAfOnOffClusterServerCommandParse(cmd);
             break;
-        case ZCL_SCENES_CLUSTER_ID:
+        case ZCL_SCENES_CLUSTER_ID :
             result = emberAfScenesClusterServerCommandParse(cmd);
             break;
-        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
             // No commands are enabled for cluster Temperature Measurement
             result = status(false, true, cmd->mfgSpecific);
             break;
@@ -160,20 +162,20 @@ EmberAfStatus emberAfBarrierControlClusterServerCommandParse(EmberAfClusterComma
         switch (cmd->commandId)
         {
         case ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t percentOpen;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t percentOpen;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            percentOpen = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  percentOpen = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfBarrierControlClusterBarrierControlGoToPercentCallback(percentOpen);
             break;
         }
         case ZCL_BARRIER_CONTROL_STOP_COMMAND_ID: {
-            wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback();
+        wasHandled = emberAfBarrierControlClusterBarrierControlStopCallback();
             break;
         }
         default: {
@@ -193,550 +195,542 @@ EmberAfStatus emberAfColorControlClusterServerCommandParse(EmberAfClusterCommand
         switch (cmd->commandId)
         {
         case ZCL_MOVE_COLOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            int16_t rateX;
-            int16_t rateY;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rateX         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rateY         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+int16_t rateX;
+int16_t rateY;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rateX = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rateY = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveColorCallback(rateX, rateY, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint16_t rate;
-            uint16_t colorTemperatureMinimum;
-            uint16_t colorTemperatureMaximum;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(
-                moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint16_t rate;
+uint16_t colorTemperatureMinimum;
+uint16_t colorTemperatureMaximum;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveColorTemperatureCallback(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_HUE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveHueCallback(moveMode, rate, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveSaturationCallback(moveMode, rate, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_COLOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t colorX;
-            uint16_t colorY;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorX        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorY        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t colorX;
+uint16_t colorY;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorX = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorY = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToColorCallback(colorX, colorY, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t colorTemperature;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperature = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset    = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask,
-                                                                                  optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t colorTemperature;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperature = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToColorTemperatureCallback(colorTemperature, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_HUE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t hue;
-            uint8_t direction;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            hue           = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            direction     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t hue;
+uint8_t direction;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  hue = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  direction = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToHueCallback(hue, direction, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t hue;
-            uint8_t saturation;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            hue           = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            saturation    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask,
-                                                                                  optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t hue;
+uint8_t saturation;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  hue = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  saturation = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToHueAndSaturationCallback(hue, saturation, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_MOVE_TO_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t saturation;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            saturation    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t saturation;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  saturation = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterMoveToSaturationCallback(saturation, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_COLOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            int16_t stepX;
-            int16_t stepY;
-            uint16_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepX         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepY         = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+int16_t stepX;
+int16_t stepY;
+uint16_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepX = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepY = static_cast<int16_t>(emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen));
+  payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepColorCallback(stepX, stepY, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint16_t stepSize;
-            uint16_t transitionTime;
-            uint16_t colorTemperatureMinimum;
-            uint16_t colorTemperatureMaximum;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset           = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(
-                stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint16_t stepSize;
+uint16_t transitionTime;
+uint16_t colorTemperatureMinimum;
+uint16_t colorTemperatureMaximum;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMinimum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  colorTemperatureMaximum = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepColorTemperatureCallback(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_HUE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint8_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint8_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepHueCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STEP_SATURATION_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint8_t transitionTime;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint8_t transitionTime;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStepSaturationCallback(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
             break;
         }
         case ZCL_STOP_MOVE_STEP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t optionsMask;
-            uint8_t optionsOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsMask   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t optionsMask;
+uint8_t optionsOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionsOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfColorControlClusterStopMoveStepCallback(optionsMask, optionsOverride);
             break;
         }
         default: {
@@ -756,29 +750,29 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status);
             break;
         }
         case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
 
-            wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status);
             break;
         }
         default: {
@@ -798,454 +792,452 @@ EmberAfStatus emberAfDoorLockClusterServerCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_CLEAR_ALL_PINS_COMMAND_ID: {
-            wasHandled = emberAfDoorLockClusterClearAllPinsCallback();
+        wasHandled = emberAfDoorLockClusterClearAllPinsCallback();
             break;
         }
         case ZCL_CLEAR_ALL_RFIDS_COMMAND_ID: {
-            wasHandled = emberAfDoorLockClusterClearAllRfidsCallback();
+        wasHandled = emberAfDoorLockClusterClearAllRfidsCallback();
             break;
         }
         case ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearHolidayScheduleCallback(scheduleId);
             break;
         }
         case ZCL_CLEAR_PIN_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            wasHandled = emberAfDoorLockClusterClearPinCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearPinCallback(userId);
             break;
         }
         case ZCL_CLEAR_RFID_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearRfidCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearRfidCallback(userId);
             break;
         }
         case ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearWeekdayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearYeardayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetHolidayScheduleCallback(scheduleId);
             break;
         }
         case ZCL_GET_LOG_RECORD_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t logIndex;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            logIndex = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t logIndex;
 
-            wasHandled = emberAfDoorLockClusterGetLogRecordCallback(logIndex);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  logIndex = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetLogRecordCallback(logIndex);
             break;
         }
         case ZCL_GET_PIN_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetPinCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetPinCallback(userId);
             break;
         }
         case ZCL_GET_RFID_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            wasHandled = emberAfDoorLockClusterGetRfidCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetRfidCallback(userId);
             break;
         }
         case ZCL_GET_USER_TYPE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
 
-            wasHandled = emberAfDoorLockClusterGetUserTypeCallback(userId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetUserTypeCallback(userId);
             break;
         }
         case ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetWeekdayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetYeardayScheduleCallback(scheduleId, userId);
             break;
         }
         case ZCL_LOCK_DOOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t * PIN;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t * PIN;
 
-            wasHandled = emberAfDoorLockClusterLockDoorCallback(PIN);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterLockDoorCallback(PIN);
             break;
         }
         case ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-            uint8_t operatingModeDuringHoliday;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime  = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime,
-                                                                          operatingModeDuringHoliday);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint32_t localStartTime;
+uint32_t localEndTime;
+uint8_t operatingModeDuringHoliday;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetHolidayScheduleCallback(scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
             break;
         }
         case ZCL_SET_PIN_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetPinCallback(userId, userStatus, userType, pin);
             break;
         }
         case ZCL_SET_RFID_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * id;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            id = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, id);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * id;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  id = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetRfidCallback(userId, userStatus, userType, id);
             break;
         }
         case ZCL_SET_USER_TYPE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userType;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userType;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetUserTypeCallback(userId, userType);
             break;
         }
         case ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint8_t daysMask;
-            uint8_t startHour;
-            uint8_t startMinute;
-            uint8_t endHour;
-            uint8_t endMinute;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            daysMask      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startHour     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startMinute   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endHour       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute,
-                                                                          endHour, endMinute);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint8_t daysMask;
+uint8_t startHour;
+uint8_t startMinute;
+uint8_t endHour;
+uint8_t endMinute;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  daysMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetWeekdayScheduleCallback(scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
             break;
         }
         case ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint32_t localStartTime;
+uint32_t localEndTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetYeardayScheduleCallback(scheduleId, userId, localStartTime, localEndTime);
             break;
         }
         case ZCL_UNLOCK_DOOR_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t * PIN;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t * PIN;
 
-            wasHandled = emberAfDoorLockClusterUnlockDoorCallback(PIN);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  PIN = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockDoorCallback(PIN);
             break;
         }
         case ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t timeoutInSeconds;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutInSeconds = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset    = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t timeoutInSeconds;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutInSeconds = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockWithTimeoutCallback(timeoutInSeconds, pin);
             break;
         }
         default: {
@@ -1265,89 +1257,89 @@ EmberAfStatus emberAfGroupsClusterServerCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_GROUP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t * groupName;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterAddGroupCallback(groupId, groupName);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t * groupName;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterAddGroupCallback(groupId, groupName);
             break;
         }
         case ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t * groupName;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, groupName);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t * groupName;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterAddGroupIfIdentifyingCallback(groupId, groupName);
             break;
         }
         case ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t groupCount;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t groupCount;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
 
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupCount    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            groupList     = cmd->buffer + payloadOffset;
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupCount = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    groupList = cmd->buffer + payloadOffset;
 
-            wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
+wasHandled = emberAfGroupsClusterGetGroupMembershipCallback(groupCount, groupList);
             break;
         }
         case ZCL_REMOVE_ALL_GROUPS_COMMAND_ID: {
-            wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback();
+        wasHandled = emberAfGroupsClusterRemoveAllGroupsCallback();
             break;
         }
         case ZCL_REMOVE_GROUP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            wasHandled = emberAfGroupsClusterRemoveGroupCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterRemoveGroupCallback(groupId);
             break;
         }
         case ZCL_VIEW_GROUP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            wasHandled = emberAfGroupsClusterViewGroupCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterViewGroupCallback(groupId);
             break;
         }
         default: {
@@ -1367,23 +1359,23 @@ EmberAfStatus emberAfIasZoneClusterServerCommandParse(EmberAfClusterCommand * cm
         switch (cmd->commandId)
         {
         case ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t enrollResponseCode;
-            uint8_t zoneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            enrollResponseCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset      = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t enrollResponseCode;
+uint8_t zoneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  enrollResponseCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  zoneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfIasZoneClusterZoneEnrollResponseCallback(enrollResponseCode, zoneId);
             break;
         }
         default: {
@@ -1403,20 +1395,20 @@ EmberAfStatus emberAfIdentifyClusterServerCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_IDENTIFY_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t identifyTime;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            identifyTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t identifyTime;
 
-            wasHandled = emberAfIdentifyClusterIdentifyCallback(identifyTime);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  identifyTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfIdentifyClusterIdentifyCallback(identifyTime);
             break;
         }
         case ZCL_IDENTIFY_QUERY_COMMAND_ID: {
-            wasHandled = emberAfIdentifyClusterIdentifyQueryCallback();
+        wasHandled = emberAfIdentifyClusterIdentifyQueryCallback();
             break;
         }
         default: {
@@ -1436,203 +1428,203 @@ EmberAfStatus emberAfLevelControlClusterServerCommandParse(EmberAfClusterCommand
         switch (cmd->commandId)
         {
         case ZCL_MOVE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate          = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveCallback(moveMode, rate, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelCallback(level, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t level;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            level         = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t level;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  level = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveToLevelWithOnOffCallback(level, transitionTime);
             break;
         }
         case ZCL_MOVE_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t moveMode;
-            uint8_t rate;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            moveMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t moveMode;
+uint8_t rate;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  moveMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rate = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterMoveWithOnOffCallback(moveMode, rate);
             break;
         }
         case ZCL_STEP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepCallback(stepMode, stepSize, transitionTime, optionMask, optionOverride);
             break;
         }
         case ZCL_STEP_WITH_ON_OFF_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t stepMode;
-            uint8_t stepSize;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepMode      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            stepSize      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t stepMode;
+uint8_t stepSize;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepMode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  stepSize = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStepWithOnOffCallback(stepMode, stepSize, transitionTime);
             break;
         }
         case ZCL_STOP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t optionMask;
-            uint8_t optionOverride;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionMask    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t optionMask;
+uint8_t optionOverride;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  optionOverride = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfLevelControlClusterStopCallback(optionMask, optionOverride);
             break;
         }
         case ZCL_STOP_WITH_ON_OFF_COMMAND_ID: {
-            wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
+        wasHandled = emberAfLevelControlClusterStopWithOnOffCallback();
             break;
         }
         default: {
@@ -1652,7 +1644,7 @@ EmberAfStatus emberAfLowPowerClusterServerCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_SLEEP_COMMAND_ID: {
-            wasHandled = emberAfLowPowerClusterSleepCallback();
+        wasHandled = emberAfLowPowerClusterSleepCallback();
             break;
         }
         default: {
@@ -1672,276 +1664,276 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ADD_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ADD_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_DISABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterDisableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_ENABLE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan networkID;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                networkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan networkID;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  networkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + networkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterEnableNetworkCallback(networkID, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint32_t timeoutMs;
 
-            wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
+  if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(timeoutMs);
             break;
         }
         case ZCL_REMOVE_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan NetworkID;
-            uint64_t Breadcrumb;
-            uint32_t TimeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                NetworkID         = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            Breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan NetworkID;
+uint64_t Breadcrumb;
+uint32_t TimeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  NetworkID = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + NetworkID.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  Breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  TimeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkCallback(NetworkID, Breadcrumb, TimeoutMs);
             break;
         }
         case ZCL_SCAN_NETWORKS_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterScanNetworksCallback(ssid, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan operationalDataset;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData  = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan operationalDataset;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  operationalDataset = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + operationalDataset.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(operationalDataset, breadcrumb, timeoutMs);
             break;
         }
         case ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            chip::ByteSpan ssid;
-            chip::ByteSpan credentials;
-            uint64_t breadcrumb;
-            uint32_t timeoutMs;
-
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                ssid              = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            {
-                uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                credentials       = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
-            }
-            payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
-            if (cmd->bufLen < payloadOffset + 8)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            breadcrumb    = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+chip::ByteSpan ssid;
+chip::ByteSpan credentials;
+uint64_t breadcrumb;
+uint32_t timeoutMs;
+
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  ssid = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + ssid.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  {
+  uint8_t * rawData = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  credentials = chip::ByteSpan(rawData + 1u, emberAfStringLength(rawData));
+  }
+  payloadOffset = static_cast<uint16_t>(payloadOffset + credentials.size() + 1u);
+  if (cmd->bufLen < payloadOffset + 8)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  breadcrumb = emberAfGetInt64u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 8);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeoutMs = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(ssid, credentials, breadcrumb, timeoutMs);
             break;
         }
         default: {
@@ -1961,15 +1953,15 @@ EmberAfStatus emberAfOnOffClusterServerCommandParse(EmberAfClusterCommand * cmd)
         switch (cmd->commandId)
         {
         case ZCL_OFF_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOffCallback();
+        wasHandled = emberAfOnOffClusterOffCallback();
             break;
         }
         case ZCL_ON_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterOnCallback();
+        wasHandled = emberAfOnOffClusterOnCallback();
             break;
         }
         case ZCL_TOGGLE_COMMAND_ID: {
-            wasHandled = emberAfOnOffClusterToggleCallback();
+        wasHandled = emberAfOnOffClusterToggleCallback();
             break;
         }
         default: {
@@ -1989,153 +1981,153 @@ EmberAfStatus emberAfScenesClusterServerCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-            uint16_t transitionTime;
-            uint8_t * sceneName;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneName          = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset      = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
-            extensionFieldSets = cmd->buffer + payloadOffset;
-
-            wasHandled = emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+uint16_t transitionTime;
+uint8_t * sceneName;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
+  extensionFieldSets = cmd->buffer + payloadOffset;
+
+wasHandled = emberAfScenesClusterAddSceneCallback(groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterGetSceneMembershipCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterGetSceneMembershipCallback(groupId);
             break;
         }
         case ZCL_RECALL_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-            uint16_t transitionTime;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+uint16_t transitionTime;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRecallSceneCallback(groupId, sceneId, transitionTime);
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
 
-            wasHandled = emberAfScenesClusterRemoveAllScenesCallback(groupId);
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveAllScenesCallback(groupId);
             break;
         }
         case ZCL_REMOVE_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveSceneCallback(groupId, sceneId);
             break;
         }
         case ZCL_STORE_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterStoreSceneCallback(groupId, sceneId);
             break;
         }
         case ZCL_VIEW_SCENE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterViewSceneCallback(groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterViewSceneCallback(groupId, sceneId);
             break;
         }
         default: {
diff --git a/examples/tv-app/tv-common/gen/callback-stub.cpp b/examples/tv-app/tv-common/gen/callback-stub.cpp
index 19505eebaff8da..f96be825df458b 100644
--- a/examples/tv-app/tv-common/gen/callback-stub.cpp
+++ b/examples/tv-app/tv-common/gen/callback-stub.cpp
@@ -29,46 +29,46 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+     case ZCL_APPLICATION_BASIC_CLUSTER_ID :
         emberAfApplicationBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+     case ZCL_BARRIER_CONTROL_CLUSTER_ID :
         emberAfBarrierControlClusterInitCallback(endpoint);
         break;
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+     case ZCL_COLOR_CONTROL_CLUSTER_ID :
         emberAfColorControlClusterInitCallback(endpoint);
         break;
-    case ZCL_DOOR_LOCK_CLUSTER_ID:
+     case ZCL_DOOR_LOCK_CLUSTER_ID :
         emberAfDoorLockClusterInitCallback(endpoint);
         break;
-    case ZCL_GROUPS_CLUSTER_ID:
+     case ZCL_GROUPS_CLUSTER_ID :
         emberAfGroupsClusterInitCallback(endpoint);
         break;
-    case ZCL_IAS_ZONE_CLUSTER_ID:
+     case ZCL_IAS_ZONE_CLUSTER_ID :
         emberAfIasZoneClusterInitCallback(endpoint);
         break;
-    case ZCL_IDENTIFY_CLUSTER_ID:
+     case ZCL_IDENTIFY_CLUSTER_ID :
         emberAfIdentifyClusterInitCallback(endpoint);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+     case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
-    case ZCL_LOW_POWER_CLUSTER_ID:
+     case ZCL_LOW_POWER_CLUSTER_ID :
         emberAfLowPowerClusterInitCallback(endpoint);
         break;
-    case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID:
+     case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID :
         emberAfNetworkCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+     case ZCL_ON_OFF_CLUSTER_ID :
         emberAfOnOffClusterInitCallback(endpoint);
         break;
-    case ZCL_SCENES_CLUSTER_ID:
+     case ZCL_SCENES_CLUSTER_ID :
         emberAfScenesClusterInitCallback(endpoint);
         break;
-    case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+     case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
         emberAfTemperatureMeasurementClusterInitCallback(endpoint);
         break;
     default:
@@ -212,9 +212,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -229,8 +230,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -245,8 +247,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -263,7 +266,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -280,7 +284,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -297,7 +302,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -322,8 +328,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -342,9 +349,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -363,9 +370,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -383,7 +390,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -407,7 +415,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -430,9 +439,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -454,9 +464,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -476,10 +487,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -492,7 +505,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -533,9 +547,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -551,7 +566,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -602,9 +618,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -620,7 +637,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -656,8 +674,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -692,8 +711,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/examples/tv-app/tv-common/gen/callback.h b/examples/tv-app/tv-common/gen/callback.h
index f086c1baafc3fc..ced1cfa070b767 100644
--- a/examples/tv-app/tv-common/gen/callback.h
+++ b/examples/tv-app/tv-common/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Application Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Barrier Control Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -63,6 +66,7 @@ void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Color Control Cluster Init
  *
  * Cluster Init
@@ -71,6 +75,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Door Lock Cluster Init
  *
  * Cluster Init
@@ -79,6 +84,7 @@ void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Groups Cluster Init
  *
  * Cluster Init
@@ -87,6 +93,7 @@ void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief IAS Zone Cluster Init
  *
  * Cluster Init
@@ -95,6 +102,7 @@ void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfIasZoneClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Identify Cluster Init
  *
  * Cluster Init
@@ -103,6 +111,7 @@ void emberAfIasZoneClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Level Control Cluster Init
  *
  * Cluster Init
@@ -111,6 +120,7 @@ void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Low Power Cluster Init
  *
  * Cluster Init
@@ -119,6 +129,7 @@ void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Network Commissioning Cluster Init
  *
  * Cluster Init
@@ -127,6 +138,7 @@ void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief On/off Cluster Init
  *
  * Cluster Init
@@ -135,6 +147,7 @@ void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Scenes Cluster Init
  *
  * Cluster Init
@@ -143,6 +156,7 @@ void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Temperature Measurement Cluster Init
  *
  * Cluster Init
@@ -151,8 +165,10 @@ void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfTemperatureMeasurementClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Application Basic Cluster server
 //
@@ -182,9 +198,7 @@ void emberAfApplicationBasicClusterServerAttributeChangedCallback(chip::Endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                      chip::AttributeId attributeId,
-                                                                                      uint16_t manufacturerCode);
+void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Application Basic Cluster Server Message Sent
  *
@@ -197,9 +211,7 @@ void emberAfApplicationBasicClusterServerManufacturerSpecificAttributeChangedCal
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                             EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                             EmberStatus status);
+void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Application Basic Cluster Server Pre Attribute Changed
  *
@@ -211,10 +223,7 @@ void emberAfApplicationBasicClusterServerMessageSentCallback(EmberOutgoingMessag
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfApplicationBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              EmberAfAttributeType attributeType, uint8_t size,
-                                                                              uint8_t * value);
+EmberAfStatus emberAfApplicationBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Application Basic Cluster Server Tick
  *
@@ -253,9 +262,7 @@ void emberAfBarrierControlClusterClientAttributeChangedCallback(chip::EndpointId
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    uint16_t manufacturerCode);
+void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Barrier Control Cluster Client Message Sent
  *
@@ -268,9 +275,7 @@ void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallb
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                           EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                           EmberStatus status);
+void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Barrier Control Cluster Client Pre Attribute Changed
  *
@@ -282,10 +287,7 @@ void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageT
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBarrierControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            EmberAfAttributeType attributeType, uint8_t size,
-                                                                            uint8_t * value);
+EmberAfStatus emberAfBarrierControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Barrier Control Cluster Client Tick
  *
@@ -324,9 +326,7 @@ void emberAfBarrierControlClusterServerAttributeChangedCallback(chip::EndpointId
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBarrierControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    uint16_t manufacturerCode);
+void emberAfBarrierControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Barrier Control Cluster Server Message Sent
  *
@@ -339,9 +339,7 @@ void emberAfBarrierControlClusterServerManufacturerSpecificAttributeChangedCallb
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                           EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                           EmberStatus status);
+void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Barrier Control Cluster Server Pre Attribute Changed
  *
@@ -353,10 +351,7 @@ void emberAfBarrierControlClusterServerMessageSentCallback(EmberOutgoingMessageT
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBarrierControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            EmberAfAttributeType attributeType, uint8_t size,
-                                                                            uint8_t * value);
+EmberAfStatus emberAfBarrierControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Barrier Control Cluster Server Tick
  *
@@ -395,8 +390,7 @@ void emberAfBasicClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Server Message Sent
  *
@@ -409,8 +403,7 @@ void emberAfBasicClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Server Pre Attribute Changed
  *
@@ -422,9 +415,7 @@ void emberAfBasicClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Server Tick
  *
@@ -463,9 +454,7 @@ void emberAfColorControlClusterClientAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Color Control Cluster Client Message Sent
  *
@@ -478,9 +467,7 @@ void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Color Control Cluster Client Pre Attribute Changed
  *
@@ -492,9 +479,7 @@ void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfColorControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfColorControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Color Control Cluster Client Tick
  *
@@ -533,9 +518,7 @@ void emberAfColorControlClusterServerAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Color Control Cluster Server Message Sent
  *
@@ -548,9 +531,7 @@ void emberAfColorControlClusterServerManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Color Control Cluster Server Pre Attribute Changed
  *
@@ -562,9 +543,7 @@ void emberAfColorControlClusterServerMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfColorControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfColorControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Color Control Cluster Server Tick
  *
@@ -603,9 +582,7 @@ void emberAfDoorLockClusterClientAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Door Lock Cluster Client Message Sent
  *
@@ -618,9 +595,7 @@ void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Door Lock Cluster Client Pre Attribute Changed
  *
@@ -632,9 +607,7 @@ void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfDoorLockClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfDoorLockClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Door Lock Cluster Client Tick
  *
@@ -673,9 +646,7 @@ void emberAfDoorLockClusterServerAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfDoorLockClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfDoorLockClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Door Lock Cluster Server Message Sent
  *
@@ -688,9 +659,7 @@ void emberAfDoorLockClusterServerManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Door Lock Cluster Server Pre Attribute Changed
  *
@@ -702,9 +671,7 @@ void emberAfDoorLockClusterServerMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfDoorLockClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfDoorLockClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Door Lock Cluster Server Tick
  *
@@ -743,9 +710,7 @@ void emberAfGroupsClusterServerAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Groups Cluster Server Message Sent
  *
@@ -758,9 +723,7 @@ void emberAfGroupsClusterServerManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Groups Cluster Server Pre Attribute Changed
  *
@@ -772,9 +735,7 @@ void emberAfGroupsClusterServerMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGroupsClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfGroupsClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Groups Cluster Server Tick
  *
@@ -813,9 +774,7 @@ void emberAfIasZoneClusterServerAttributeChangedCallback(chip::EndpointId endpoi
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfIasZoneClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                             chip::AttributeId attributeId,
-                                                                             uint16_t manufacturerCode);
+void emberAfIasZoneClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief IAS Zone Cluster Server Message Sent
  *
@@ -828,9 +787,7 @@ void emberAfIasZoneClusterServerManufacturerSpecificAttributeChangedCallback(chi
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                    EmberStatus status);
+void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief IAS Zone Cluster Server Pre Attribute Changed
  *
@@ -842,9 +799,7 @@ void emberAfIasZoneClusterServerMessageSentCallback(EmberOutgoingMessageType typ
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfIasZoneClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                     EmberAfAttributeType attributeType, uint8_t size,
-                                                                     uint8_t * value);
+EmberAfStatus emberAfIasZoneClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief IAS Zone Cluster Server Tick
  *
@@ -883,9 +838,7 @@ void emberAfIdentifyClusterServerAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Identify Cluster Server Message Sent
  *
@@ -898,9 +851,7 @@ void emberAfIdentifyClusterServerManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Identify Cluster Server Pre Attribute Changed
  *
@@ -912,9 +863,7 @@ void emberAfIdentifyClusterServerMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfIdentifyClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfIdentifyClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Identify Cluster Server Tick
  *
@@ -953,9 +902,7 @@ void emberAfLevelControlClusterServerAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Level Control Cluster Server Message Sent
  *
@@ -968,9 +915,7 @@ void emberAfLevelControlClusterServerManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Level Control Cluster Server Pre Attribute Changed
  *
@@ -982,9 +927,7 @@ void emberAfLevelControlClusterServerMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfLevelControlClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Level Control Cluster Server Tick
  *
@@ -1023,9 +966,7 @@ void emberAfLowPowerClusterServerAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Low Power Cluster Server Message Sent
  *
@@ -1038,9 +979,7 @@ void emberAfLowPowerClusterServerManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Low Power Cluster Server Pre Attribute Changed
  *
@@ -1052,9 +991,7 @@ void emberAfLowPowerClusterServerMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLowPowerClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfLowPowerClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Low Power Cluster Server Tick
  *
@@ -1093,9 +1030,7 @@ void emberAfNetworkCommissioningClusterServerAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Network Commissioning Cluster Server Message Sent
  *
@@ -1108,9 +1043,7 @@ void emberAfNetworkCommissioningClusterServerManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Network Commissioning Cluster Server Pre Attribute Changed
  *
@@ -1122,10 +1055,7 @@ void emberAfNetworkCommissioningClusterServerMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Network Commissioning Cluster Server Tick
  *
@@ -1164,8 +1094,7 @@ void emberAfOnOffClusterServerAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief On/off Cluster Server Message Sent
  *
@@ -1178,8 +1107,7 @@ void emberAfOnOffClusterServerManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief On/off Cluster Server Pre Attribute Changed
  *
@@ -1191,9 +1119,7 @@ void emberAfOnOffClusterServerMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfOnOffClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief On/off Cluster Server Tick
  *
@@ -1232,9 +1158,7 @@ void emberAfScenesClusterServerAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Scenes Cluster Server Message Sent
  *
@@ -1247,9 +1171,7 @@ void emberAfScenesClusterServerManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Scenes Cluster Server Pre Attribute Changed
  *
@@ -1261,9 +1183,7 @@ void emberAfScenesClusterServerMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfScenesClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfScenesClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Scenes Cluster Server Tick
  *
@@ -1302,9 +1222,7 @@ void emberAfTemperatureMeasurementClusterServerAttributeChangedCallback(chip::En
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                            chip::AttributeId attributeId,
-                                                                                            uint16_t manufacturerCode);
+void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Temperature Measurement Cluster Server Message Sent
  *
@@ -1317,9 +1235,7 @@ void emberAfTemperatureMeasurementClusterServerManufacturerSpecificAttributeChan
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                   EmberStatus status);
+void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Temperature Measurement Cluster Server Pre Attribute Changed
  *
@@ -1331,10 +1247,7 @@ void emberAfTemperatureMeasurementClusterServerMessageSentCallback(EmberOutgoing
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfTemperatureMeasurementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    EmberAfAttributeType attributeType,
-                                                                                    uint8_t size, uint8_t * value);
+EmberAfStatus emberAfTemperatureMeasurementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Temperature Measurement Cluster Server Tick
  *
@@ -1347,685 +1260,663 @@ void emberAfTemperatureMeasurementClusterServerTickCallback(chip::EndpointId end
 // Cluster Commands Callback
 
 /**
- * @brief Barrier Control Cluster BarrierControlGoToPercent Command callback
- * @param percentOpen
- */
+* @brief Barrier Control Cluster BarrierControlGoToPercent Command callback
+* @param percentOpen
+*/
 
 bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(uint8_t percentOpen);
 
 /**
- * @brief Barrier Control Cluster BarrierControlStop Command callback
- */
+* @brief Barrier Control Cluster BarrierControlStop Command callback
+*/
 
 bool emberAfBarrierControlClusterBarrierControlStopCallback();
 
 /**
- * @brief Color Control Cluster MoveColor Command callback
- * @param rateX
- * @param rateY
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveColor Command callback
+* @param rateX
+* @param rateY
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterMoveColorCallback(int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveColorTemperature Command callback
- * @param moveMode
- * @param rate
- * @param colorTemperatureMinimum
- * @param colorTemperatureMaximum
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveColorTemperature Command callback
+* @param moveMode
+* @param rate
+* @param colorTemperatureMinimum
+* @param colorTemperatureMaximum
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum,
-                                                            uint16_t colorTemperatureMaximum, uint8_t optionsMask,
-                                                            uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveColorTemperatureCallback(uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveHue Command callback
- * @param moveMode
- * @param rate
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveHue Command callback
+* @param moveMode
+* @param rate
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterMoveHueCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveSaturation Command callback
- * @param moveMode
- * @param rate
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveSaturation Command callback
+* @param moveMode
+* @param rate
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterMoveSaturationCallback(uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToColor Command callback
- * @param colorX
- * @param colorY
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToColor Command callback
+* @param colorX
+* @param colorY
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask,
-                                                   uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToColorCallback(uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToColorTemperature Command callback
- * @param colorTemperature
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToColorTemperature Command callback
+* @param colorTemperature
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemperature, uint16_t transitionTime,
-                                                              uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToColorTemperatureCallback(uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToHue Command callback
- * @param hue
- * @param direction
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToHue Command callback
+* @param hue
+* @param direction
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask,
-                                                 uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToHueCallback(uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToHueAndSaturation Command callback
- * @param hue
- * @param saturation
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToHueAndSaturation Command callback
+* @param hue
+* @param saturation
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8_t saturation, uint16_t transitionTime,
-                                                              uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToHueAndSaturationCallback(uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster MoveToSaturation Command callback
- * @param saturation
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster MoveToSaturation Command callback
+* @param saturation
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask,
-                                                        uint8_t optionsOverride);
+bool emberAfColorControlClusterMoveToSaturationCallback(uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepColor Command callback
- * @param stepX
- * @param stepY
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepColor Command callback
+* @param stepX
+* @param stepY
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask,
-                                                 uint8_t optionsOverride);
+bool emberAfColorControlClusterStepColorCallback(int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepColorTemperature Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param colorTemperatureMinimum
- * @param colorTemperatureMaximum
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepColorTemperature Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param colorTemperatureMinimum
+* @param colorTemperatureMaximum
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime,
-                                                            uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum,
-                                                            uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterStepColorTemperatureCallback(uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepHue Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepHue Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask,
-                                               uint8_t optionsOverride);
+bool emberAfColorControlClusterStepHueCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StepSaturation Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StepSaturation Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionsMask
+* @param optionsOverride
+*/
 
-bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime,
-                                                      uint8_t optionsMask, uint8_t optionsOverride);
+bool emberAfColorControlClusterStepSaturationCallback(uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Color Control Cluster StopMoveStep Command callback
- * @param optionsMask
- * @param optionsOverride
- */
+* @brief Color Control Cluster StopMoveStep Command callback
+* @param optionsMask
+* @param optionsOverride
+*/
 
 bool emberAfColorControlClusterStopMoveStepCallback(uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
- * @brief Door Lock Cluster LockDoorResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster LockDoorResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster UnlockDoorResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster UnlockDoorResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearAllPins Command callback
- */
+* @brief Door Lock Cluster ClearAllPins Command callback
+*/
 
 bool emberAfDoorLockClusterClearAllPinsCallback();
 
 /**
- * @brief Door Lock Cluster ClearAllRfids Command callback
- */
+* @brief Door Lock Cluster ClearAllRfids Command callback
+*/
 
 bool emberAfDoorLockClusterClearAllRfidsCallback();
 
 /**
- * @brief Door Lock Cluster ClearHolidaySchedule Command callback
- * @param scheduleId
- */
+* @brief Door Lock Cluster ClearHolidaySchedule Command callback
+* @param scheduleId
+*/
 
 bool emberAfDoorLockClusterClearHolidayScheduleCallback(uint8_t scheduleId);
 
 /**
- * @brief Door Lock Cluster ClearPin Command callback
- * @param userId
- */
+* @brief Door Lock Cluster ClearPin Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearPinCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster ClearRfid Command callback
- * @param userId
- */
+* @brief Door Lock Cluster ClearRfid Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearRfidCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster ClearWeekdaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster ClearWeekdaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster ClearYeardaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster ClearYeardaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterClearYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetHolidaySchedule Command callback
- * @param scheduleId
- */
+* @brief Door Lock Cluster GetHolidaySchedule Command callback
+* @param scheduleId
+*/
 
 bool emberAfDoorLockClusterGetHolidayScheduleCallback(uint8_t scheduleId);
 
 /**
- * @brief Door Lock Cluster GetLogRecord Command callback
- * @param logIndex
- */
+* @brief Door Lock Cluster GetLogRecord Command callback
+* @param logIndex
+*/
 
 bool emberAfDoorLockClusterGetLogRecordCallback(uint16_t logIndex);
 
 /**
- * @brief Door Lock Cluster GetPin Command callback
- * @param userId
- */
+* @brief Door Lock Cluster GetPin Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetPinCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetRfid Command callback
- * @param userId
- */
+* @brief Door Lock Cluster GetRfid Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetRfidCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetUserType Command callback
- * @param userId
- */
+* @brief Door Lock Cluster GetUserType Command callback
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetUserTypeCallback(uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetWeekdaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster GetWeekdaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster GetYeardaySchedule Command callback
- * @param scheduleId
- * @param userId
- */
+* @brief Door Lock Cluster GetYeardaySchedule Command callback
+* @param scheduleId
+* @param userId
+*/
 
 bool emberAfDoorLockClusterGetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId);
 
 /**
- * @brief Door Lock Cluster LockDoor Command callback
- * @param pin
- */
+* @brief Door Lock Cluster LockDoor Command callback
+* @param pin
+*/
 
 bool emberAfDoorLockClusterLockDoorCallback(uint8_t * PIN);
 
 /**
- * @brief Door Lock Cluster SetHolidaySchedule Command callback
- * @param scheduleId
- * @param localStartTime
- * @param localEndTime
- * @param operatingModeDuringHoliday
- */
+* @brief Door Lock Cluster SetHolidaySchedule Command callback
+* @param scheduleId
+* @param localStartTime
+* @param localEndTime
+* @param operatingModeDuringHoliday
+*/
 
-bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime,
-                                                      uint8_t operatingModeDuringHoliday);
+bool emberAfDoorLockClusterSetHolidayScheduleCallback(uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
 
 /**
- * @brief Door Lock Cluster SetPin Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param pin
- */
+* @brief Door Lock Cluster SetPin Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param pin
+*/
 
 bool emberAfDoorLockClusterSetPinCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin);
 
 /**
- * @brief Door Lock Cluster SetRfid Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param id
- */
+* @brief Door Lock Cluster SetRfid Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param id
+*/
 
 bool emberAfDoorLockClusterSetRfidCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * id);
 
 /**
- * @brief Door Lock Cluster SetUserType Command callback
- * @param userId
- * @param userType
- */
+* @brief Door Lock Cluster SetUserType Command callback
+* @param userId
+* @param userType
+*/
 
 bool emberAfDoorLockClusterSetUserTypeCallback(uint16_t userId, uint8_t userType);
 
 /**
- * @brief Door Lock Cluster SetWeekdaySchedule Command callback
- * @param scheduleId
- * @param userId
- * @param daysMask
- * @param startHour
- * @param startMinute
- * @param endHour
- * @param endMinute
- */
+* @brief Door Lock Cluster SetWeekdaySchedule Command callback
+* @param scheduleId
+* @param userId
+* @param daysMask
+* @param startHour
+* @param startMinute
+* @param endHour
+* @param endMinute
+*/
 
-bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour,
-                                                      uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+bool emberAfDoorLockClusterSetWeekdayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
 /**
- * @brief Door Lock Cluster SetYeardaySchedule Command callback
- * @param scheduleId
- * @param userId
- * @param localStartTime
- * @param localEndTime
- */
+* @brief Door Lock Cluster SetYeardaySchedule Command callback
+* @param scheduleId
+* @param userId
+* @param localStartTime
+* @param localEndTime
+*/
 
-bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint32_t localStartTime,
-                                                      uint32_t localEndTime);
+bool emberAfDoorLockClusterSetYeardayScheduleCallback(uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime);
 
 /**
- * @brief Door Lock Cluster UnlockDoor Command callback
- * @param pin
- */
+* @brief Door Lock Cluster UnlockDoor Command callback
+* @param pin
+*/
 
 bool emberAfDoorLockClusterUnlockDoorCallback(uint8_t * PIN);
 
 /**
- * @brief Door Lock Cluster UnlockWithTimeout Command callback
- * @param timeoutInSeconds
- * @param pin
- */
+* @brief Door Lock Cluster UnlockWithTimeout Command callback
+* @param timeoutInSeconds
+* @param pin
+*/
 
 bool emberAfDoorLockClusterUnlockWithTimeoutCallback(uint16_t timeoutInSeconds, uint8_t * pin);
 
 /**
- * @brief Groups Cluster AddGroup Command callback
- * @param groupId
- * @param groupName
- */
+* @brief Groups Cluster AddGroup Command callback
+* @param groupId
+* @param groupName
+*/
 
 bool emberAfGroupsClusterAddGroupCallback(uint16_t groupId, uint8_t * groupName);
 
 /**
- * @brief Groups Cluster AddGroupIfIdentifying Command callback
- * @param groupId
- * @param groupName
- */
+* @brief Groups Cluster AddGroupIfIdentifying Command callback
+* @param groupId
+* @param groupName
+*/
 
 bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(uint16_t groupId, uint8_t * groupName);
 
 /**
- * @brief Groups Cluster GetGroupMembership Command callback
- * @param groupCount
- * @param groupList
- */
+* @brief Groups Cluster GetGroupMembership Command callback
+* @param groupCount
+* @param groupList
+*/
 
-bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount,
-                                                    /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
+bool emberAfGroupsClusterGetGroupMembershipCallback(uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList);
 
 /**
- * @brief Groups Cluster RemoveAllGroups Command callback
- */
+* @brief Groups Cluster RemoveAllGroups Command callback
+*/
 
 bool emberAfGroupsClusterRemoveAllGroupsCallback();
 
 /**
- * @brief Groups Cluster RemoveGroup Command callback
- * @param groupId
- */
+* @brief Groups Cluster RemoveGroup Command callback
+* @param groupId
+*/
 
 bool emberAfGroupsClusterRemoveGroupCallback(uint16_t groupId);
 
 /**
- * @brief Groups Cluster ViewGroup Command callback
- * @param groupId
- */
+* @brief Groups Cluster ViewGroup Command callback
+* @param groupId
+*/
 
 bool emberAfGroupsClusterViewGroupCallback(uint16_t groupId);
 
 /**
- * @brief IAS Zone Cluster ZoneEnrollResponse Command callback
- * @param enrollResponseCode
- * @param zoneId
- */
+* @brief IAS Zone Cluster ZoneEnrollResponse Command callback
+* @param enrollResponseCode
+* @param zoneId
+*/
 
 bool emberAfIasZoneClusterZoneEnrollResponseCallback(uint8_t enrollResponseCode, uint8_t zoneId);
 
 /**
- * @brief Identify Cluster Identify Command callback
- * @param identifyTime
- */
+* @brief Identify Cluster Identify Command callback
+* @param identifyTime
+*/
 
 bool emberAfIdentifyClusterIdentifyCallback(uint16_t identifyTime);
 
 /**
- * @brief Identify Cluster IdentifyQuery Command callback
- */
+* @brief Identify Cluster IdentifyQuery Command callback
+*/
 
 bool emberAfIdentifyClusterIdentifyQueryCallback();
 
 /**
- * @brief Level Control Cluster Move Command callback
- * @param moveMode
- * @param rate
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Move Command callback
+* @param moveMode
+* @param rate
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterMoveCallback(uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevel Command callback
- * @param level
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster MoveToLevel Command callback
+* @param level
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask,
-                                                   uint8_t optionOverride);
+bool emberAfLevelControlClusterMoveToLevelCallback(uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster MoveToLevelWithOnOff Command callback
- * @param level
- * @param transitionTime
- */
+* @brief Level Control Cluster MoveToLevelWithOnOff Command callback
+* @param level
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(uint8_t level, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster MoveWithOnOff Command callback
- * @param moveMode
- * @param rate
- */
+* @brief Level Control Cluster MoveWithOnOff Command callback
+* @param moveMode
+* @param rate
+*/
 
 bool emberAfLevelControlClusterMoveWithOnOffCallback(uint8_t moveMode, uint8_t rate);
 
 /**
- * @brief Level Control Cluster Step Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Step Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+* @param optionMask
+* @param optionOverride
+*/
 
-bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask,
-                                            uint8_t optionOverride);
+bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StepWithOnOff Command callback
- * @param stepMode
- * @param stepSize
- * @param transitionTime
- */
+* @brief Level Control Cluster StepWithOnOff Command callback
+* @param stepMode
+* @param stepSize
+* @param transitionTime
+*/
 
 bool emberAfLevelControlClusterStepWithOnOffCallback(uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime);
 
 /**
- * @brief Level Control Cluster Stop Command callback
- * @param optionMask
- * @param optionOverride
- */
+* @brief Level Control Cluster Stop Command callback
+* @param optionMask
+* @param optionOverride
+*/
 
 bool emberAfLevelControlClusterStopCallback(uint8_t optionMask, uint8_t optionOverride);
 
 /**
- * @brief Level Control Cluster StopWithOnOff Command callback
- */
+* @brief Level Control Cluster StopWithOnOff Command callback
+*/
 
 bool emberAfLevelControlClusterStopWithOnOffCallback();
 
 /**
- * @brief Low Power Cluster Sleep Command callback
- */
+* @brief Low Power Cluster Sleep Command callback
+*/
 
 bool emberAfLowPowerClusterSleepCallback();
 
 /**
- * @brief Network Commissioning Cluster AddThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster AddWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster AddWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb,
-                                                              uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster DisableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster DisableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterDisableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster EnableNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster EnableNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterEnableNetworkCallback(chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster RemoveNetwork Command callback
- * @param networkID
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster RemoveNetwork Command callback
+* @param networkID
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(chip::ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs);
 
 /**
- * @brief Network Commissioning Cluster ScanNetworks Command callback
- * @param ssid
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster ScanNetworks Command callback
+* @param ssid
+* @param breadcrumb
+* @param timeoutMs
+*/
 
 bool emberAfNetworkCommissioningClusterScanNetworksCallback(chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
- * @param operationalDataset
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateThreadNetwork Command callback
+* @param operationalDataset
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                   uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
- * @param ssid
- * @param credentials
- * @param breadcrumb
- * @param timeoutMs
- */
+* @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback
+* @param ssid
+* @param credentials
+* @param breadcrumb
+* @param timeoutMs
+*/
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                 uint64_t breadcrumb, uint32_t timeoutMs);
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
- * @brief On/off Cluster Off Command callback
- */
+* @brief On/off Cluster Off Command callback
+*/
 
 bool emberAfOnOffClusterOffCallback();
 
 /**
- * @brief On/off Cluster On Command callback
- */
+* @brief On/off Cluster On Command callback
+*/
 
 bool emberAfOnOffClusterOnCallback();
 
 /**
- * @brief On/off Cluster Toggle Command callback
- */
+* @brief On/off Cluster Toggle Command callback
+*/
 
 bool emberAfOnOffClusterToggleCallback();
 
 /**
- * @brief Scenes Cluster AddScene Command callback
- * @param groupId
- * @param sceneId
- * @param transitionTime
- * @param sceneName
- * @param extensionFieldSets
- */
+* @brief Scenes Cluster AddScene Command callback
+* @param groupId
+* @param sceneId
+* @param transitionTime
+* @param sceneName
+* @param extensionFieldSets
+*/
 
-bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
-                                          /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
+bool emberAfScenesClusterAddSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets);
 
 /**
- * @brief Scenes Cluster GetSceneMembership Command callback
- * @param groupId
- */
+* @brief Scenes Cluster GetSceneMembership Command callback
+* @param groupId
+*/
 
 bool emberAfScenesClusterGetSceneMembershipCallback(uint16_t groupId);
 
 /**
- * @brief Scenes Cluster RecallScene Command callback
- * @param groupId
- * @param sceneId
- * @param transitionTime
- */
+* @brief Scenes Cluster RecallScene Command callback
+* @param groupId
+* @param sceneId
+* @param transitionTime
+*/
 
 bool emberAfScenesClusterRecallSceneCallback(uint16_t groupId, uint8_t sceneId, uint16_t transitionTime);
 
 /**
- * @brief Scenes Cluster RemoveAllScenes Command callback
- * @param groupId
- */
+* @brief Scenes Cluster RemoveAllScenes Command callback
+* @param groupId
+*/
 
 bool emberAfScenesClusterRemoveAllScenesCallback(uint16_t groupId);
 
 /**
- * @brief Scenes Cluster RemoveScene Command callback
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster RemoveScene Command callback
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterRemoveSceneCallback(uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster StoreScene Command callback
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster StoreScene Command callback
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterStoreSceneCallback(uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster ViewScene Command callback
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster ViewScene Command callback
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterViewSceneCallback(uint16_t groupId, uint8_t sceneId);
 
+
 //
 // Non-Cluster Related Callbacks
 //
@@ -2182,8 +2073,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -2202,6 +2093,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -2219,6 +2111,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -2312,8 +2205,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -2472,8 +2365,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/examples/tv-app/tv-common/gen/client-command-macro.h b/examples/tv-app/tv-common/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/examples/tv-app/tv-common/gen/client-command-macro.h
+++ b/examples/tv-app/tv-common/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/examples/tv-app/tv-common/gen/cluster-id.h b/examples/tv-app/tv-common/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/examples/tv-app/tv-common/gen/cluster-id.h
+++ b/examples/tv-app/tv-common/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/examples/tv-app/tv-common/gen/command-id.h b/examples/tv-app/tv-common/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/examples/tv-app/tv-common/gen/command-id.h
+++ b/examples/tv-app/tv-common/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/examples/tv-app/tv-common/gen/endpoint_config.h b/examples/tv-app/tv-common/gen/endpoint_config.h
index 7456853451a5d1..a953638eee635e 100644
--- a/examples/tv-app/tv-common/gen/endpoint_config.h
+++ b/examples/tv-app/tv-common/gen/endpoint_config.h
@@ -20,439 +20,291 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */                                  \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */                               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */                       \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 244 - Default for cluster: "Color Control", attribute: "compensation text". side: server, big-endian */             \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 498 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, big-endian */                    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 506 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, big-endian */               \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 538 - Default for cluster: "Application Basic", attribute: "application name". side: server, big-endian */          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 570 - Default for cluster: "Application Basic", attribute: "application id". side: server, big-endian */            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 244 - Default for cluster: "Color Control", attribute: "compensation text". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 498 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 506 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 538 - Default for cluster: "Application Basic", attribute: "application name". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 570 - Default for cluster: "Application Basic", attribute: "application id". side: server, big-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-        /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */                               \
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,    \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                \
-                                                                                                                                   \
-            /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */                            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                        \
-                                                                                                                                   \
-            /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */                    \
-            0x00, 0x00, 0x00, 0x00,                                                                                                \
-                                                                                                                                   \
-            /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 244 - Default for cluster: "Color Control", attribute: "compensation text". side: server, little-endian */          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 498 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, little-endian */                 \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 506 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, little-endian */            \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 538 - Default for cluster: "Application Basic", attribute: "application name". side: server, little-endian */       \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-                                                                                                                                   \
-            /* 570 - Default for cluster: "Application Basic", attribute: "application id". side: server, little-endian */         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,      \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                          \
-    }
+#define GENERATED_DEFAULTS { \
+  /* 0 - Default for cluster: "Basic", attribute: "VendorName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 32 - Default for cluster: "Basic", attribute: "ProductName". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 64 - Default for cluster: "Basic", attribute: "UserLabel". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 96 - Default for cluster: "Basic", attribute: "Location". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 112 - Default for cluster: "Basic", attribute: "HardwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 176 - Default for cluster: "Basic", attribute: "SoftwareVersion". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, \
+\
+  /* 180 - Default for cluster: "Basic", attribute: "SoftwareVersionString". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 244 - Default for cluster: "Color Control", attribute: "compensation text". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 498 - Default for cluster: "IAS Zone", attribute: "IAS CIE address". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 506 - Default for cluster: "Application Basic", attribute: "vendor name". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 538 - Default for cluster: "Application Basic", attribute: "application name". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+  /* 570 - Default for cluster: "Application Basic", attribute: "application id". side: server, little-endian */\
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+\
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (12)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT 109
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* Identify (server): cluster revision */                       \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_SIMPLE_DEFAULT(0x0000) },                                 /* Identify (server): identify time */                 \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Groups (server): cluster revision */                \
-            { 0x0000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },       /* Groups (server): name support */                    \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Scenes (server): cluster revision */                \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Scenes (server): scene count */                     \
-            { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Scenes (server): current scene */                   \
-            { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Scenes (server): current group */                   \
-            { 0x0003, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },  /* Scenes (server): scene valid */                     \
-            { 0x0004, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },       /* Scenes (server): name support */                    \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) },      /* On/off (server): cluster revision */                \
-            { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },  /* On/off (server): on/off */                          \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Level Control (server): cluster revision */         \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Level Control (server): current level */            \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */                                                      \
-            { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */                                                 \
-            { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(0) },                                                      /* Basic (server): VendorName */  \
-            { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */    \
-            { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(32) },                                                     /* Basic (server): ProductName */ \
-            { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */   \
-            { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */                                                       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE),                     \
-              ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */                                                        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */                                                    \
-            { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */                                          \
-            { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                          \
-              ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */                                                \
-            { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON),                                                    \
-              ZAP_LONG_DEFAULTS_INDEX(180) },                               /* Basic (server): SoftwareVersionString */            \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */ \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) },                                 /* Door Lock (client): cluster revision */                  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (server): cluster revision */                  \
-            { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* Door Lock (server): lock state */                        \
-            { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },    /* Door Lock (server): lock type */                         \
-            { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Door Lock (server): actuator enabled */                  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) },                                 /* Barrier Control (client): cluster revision */       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (server): cluster revision */       \
-            { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },         /* Barrier Control (server): barrier moving state */   \
-            { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_EMPTY_DEFAULT() },      /* Barrier Control (server): barrier safety status */  \
-            { 0x0003, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() },       /* Barrier Control (server): barrier capabilities */   \
-            { 0x000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },         /* Barrier Control (server): barrier position */       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) },                                      /* Color Control (client): cluster revision */         \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) },      /* Color Control (server): cluster revision */         \
-            { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Color Control (server): current hue */              \
-            { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },    /* Color Control (server): current saturation */       \
-            { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): remaining time */           \
-            { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* Color Control (server): current x */                \
-            { 0x0004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* Color Control (server): current y */                \
-            { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() },         /* Color Control (server): drift compensation */       \
-            { 0x0006, ZAP_TYPE(CHAR_STRING), 254, 0,                                                                               \
-              ZAP_LONG_DEFAULTS_INDEX(244) },                               /* Color Control (server): compensation text */        \
-            { 0x0007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* Color Control (server): color temperature */        \
-            { 0x0008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },    /* Color Control (server): color mode */               \
-            { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                          \
-              ZAP_SIMPLE_DEFAULT(0x00) },                            /* Color Control (server): color control options */           \
-            { 0x0010, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): number of primaries */             \
-            { 0x0011, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 x */                     \
-            { 0x0012, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 y */                     \
-            { 0x0013, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 1 intensity */             \
-            { 0x0015, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 x */                     \
-            { 0x0016, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 y */                     \
-            { 0x0017, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 2 intensity */             \
-            { 0x0019, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 x */                     \
-            { 0x001A, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 y */                     \
-            { 0x001B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 3 intensity */             \
-            { 0x0020, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 x */                     \
-            { 0x0021, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 y */                     \
-            { 0x0022, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 4 intensity */             \
-            { 0x0024, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 x */                     \
-            { 0x0025, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 y */                     \
-            { 0x0026, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 5 intensity */             \
-            { 0x0028, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 x */                     \
-            { 0x0029, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 y */                     \
-            { 0x002A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() },  /* Color Control (server): primary 6 intensity */             \
-            { 0x0030, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point x */                                                   \
-            { 0x0031, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point y */                                                   \
-            { 0x0032, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r x */                                                 \
-            { 0x0033, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r y */                                                 \
-            { 0x0034, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r intensity */                                         \
-            { 0x0036, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g x */                                                 \
-            { 0x0037, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g y */                                                 \
-            { 0x0038, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g intensity */                                         \
-            { 0x003A, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b x */                                                 \
-            { 0x003B, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b y */                                                 \
-            { 0x003C, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                            \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b intensity */                                         \
-            { 0x400D, ZAP_TYPE(INT16U), 2, 0,                                                                                      \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): couple color temp to level min-mireds */                           \
-            { 0x4010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                           \
-              ZAP_EMPTY_DEFAULT() }, /* Color Control (server): start up color temperature mireds */                               \
-            { 0x4000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) },   /* Color Control (server): enhanced current hue */   \
-            { 0x4001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) },      /* Color Control (server): enhanced color mode */    \
-            { 0x4002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* Color Control (server): color loop active */      \
-            { 0x4003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* Color Control (server): color loop direction */   \
-            { 0x4004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0019) },   /* Color Control (server): color loop time */        \
-            { 0x400A, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color capabilities */     \
-            { 0x400B, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color temp physical min */  \
-            { 0x400C, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFEFF) }, /* Color Control (server): color temp physical max */  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (server): cluster revision */    \
-            { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): measured value */ \
-            { 0x0001, ZAP_TYPE(INT16S), 2, 0,                                                                                      \
-              ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): min measured value */                             \
-            { 0x0002, ZAP_TYPE(INT16S), 2, 0,                                                                                      \
-              ZAP_SIMPLE_DEFAULT(0x8000) },                            /* Temperature Measurement (server): max measured value */  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* IAS Zone (server): cluster revision */                   \
-            { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) },      /* IAS Zone (server): zone state */                  \
-            { 0x0001, ZAP_TYPE(ENUM16), 2, 0, ZAP_EMPTY_DEFAULT() },          /* IAS Zone (server): zone type */                   \
-            { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* IAS Zone (server): zone status */                 \
-            { 0x0010, ZAP_TYPE(IEEE_ADDRESS), 8, ZAP_ATTRIBUTE_MASK(WRITABLE),                                                     \
-              ZAP_LONG_DEFAULTS_INDEX(498) },                                        /* IAS Zone (server): IAS CIE address */      \
-            { 0x0011, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xff) },             /* IAS Zone (server): Zone ID */              \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) },          /* Low Power (server): cluster revision */    \
-            { 0x0000, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(506) }, /* Application Basic (server): vendor name */ \
-            { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },                 /* Application Basic (server): vendor id */   \
-            { 0x0002, ZAP_TYPE(OCTET_STRING), 32, 0,                                                                               \
-              ZAP_LONG_DEFAULTS_INDEX(538) },                               /* Application Basic (server): application name */     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (server): cluster revision */     \
-            { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },        /* Application Basic (server): product id */           \
-            { 0x0005, ZAP_TYPE(OCTET_STRING), 32, 0,                                                                               \
-              ZAP_LONG_DEFAULTS_INDEX(570) },                            /* Application Basic (server): application id */          \
-            { 0x0006, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() },     /* Application Basic (server): catalog vendor id */       \
-            { 0x0007, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* Application Basic (server): application satus */       \
-    }
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* Identify (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x0000) }, /* Identify (server): identify time */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Groups (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Groups (server): name support */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Scenes (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Scenes (server): scene count */  \
+  { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Scenes (server): current scene */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Scenes (server): current group */  \
+  { 0x0003, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Scenes (server): scene valid */  \
+  { 0x0004, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Scenes (server): name support */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* On/off (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* On/off (server): on/off */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Level Control (server): current level */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): InteractionModelVersion */  \
+  { 0x0001, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(0) }, /* Basic (server): VendorName */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): VendorID */  \
+  { 0x0003, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(32) }, /* Basic (server): ProductName */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* Basic (server): ProductID */  \
+  { 0x0005, ZAP_TYPE(CHAR_STRING), 32, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(64) }, /* Basic (server): UserLabel */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 16, ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(96) }, /* Basic (server): Location */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(0x00) }, /* Basic (server): HardwareVersion */  \
+  { 0x0008, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(112) }, /* Basic (server): HardwareVersionString */  \
+  { 0x0009, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(176) }, /* Basic (server): SoftwareVersion */  \
+  { 0x000A, ZAP_TYPE(CHAR_STRING), 64, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_LONG_DEFAULTS_INDEX(180) }, /* Basic (server): SoftwareVersionString */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Network Commissioning (server): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Door Lock (server): lock state */  \
+  { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Door Lock (server): lock type */  \
+  { 0x0002, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Door Lock (server): actuator enabled */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (server): cluster revision */  \
+  { 0x0001, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier moving state */  \
+  { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier safety status */  \
+  { 0x0003, ZAP_TYPE(BITMAP8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier capabilities */  \
+  { 0x000A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Barrier Control (server): barrier position */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Color Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Color Control (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): current hue */  \
+  { 0x0001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): current saturation */  \
+  { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): remaining time */  \
+  { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* Color Control (server): current x */  \
+  { 0x0004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* Color Control (server): current y */  \
+  { 0x0005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): drift compensation */  \
+  { 0x0006, ZAP_TYPE(CHAR_STRING), 254, 0, ZAP_LONG_DEFAULTS_INDEX(244) }, /* Color Control (server): compensation text */  \
+  { 0x0007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* Color Control (server): color temperature */  \
+  { 0x0008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* Color Control (server): color mode */  \
+  { 0x000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): color control options */  \
+  { 0x0010, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): number of primaries */  \
+  { 0x0011, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 x */  \
+  { 0x0012, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 y */  \
+  { 0x0013, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 1 intensity */  \
+  { 0x0015, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 x */  \
+  { 0x0016, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 y */  \
+  { 0x0017, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 2 intensity */  \
+  { 0x0019, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 x */  \
+  { 0x001A, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 y */  \
+  { 0x001B, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 3 intensity */  \
+  { 0x0020, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 x */  \
+  { 0x0021, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 y */  \
+  { 0x0022, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 4 intensity */  \
+  { 0x0024, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 x */  \
+  { 0x0025, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 y */  \
+  { 0x0026, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 5 intensity */  \
+  { 0x0028, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 x */  \
+  { 0x0029, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 y */  \
+  { 0x002A, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): primary 6 intensity */  \
+  { 0x0030, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point x */  \
+  { 0x0031, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): white point y */  \
+  { 0x0032, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r x */  \
+  { 0x0033, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r y */  \
+  { 0x0034, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point r intensity */  \
+  { 0x0036, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g x */  \
+  { 0x0037, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g y */  \
+  { 0x0038, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point g intensity */  \
+  { 0x003A, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b x */  \
+  { 0x003B, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b y */  \
+  { 0x003C, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): color point b intensity */  \
+  { 0x400D, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Color Control (server): couple color temp to level min-mireds */  \
+  { 0x4010, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_EMPTY_DEFAULT() }, /* Color Control (server): start up color temperature mireds */  \
+  { 0x4000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): enhanced current hue */  \
+  { 0x4001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* Color Control (server): enhanced color mode */  \
+  { 0x4002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): color loop active */  \
+  { 0x4003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* Color Control (server): color loop direction */  \
+  { 0x4004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0019) }, /* Color Control (server): color loop time */  \
+  { 0x400A, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color capabilities */  \
+  { 0x400B, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* Color Control (server): color temp physical min */  \
+  { 0x400C, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0xFEFF) }, /* Color Control (server): color temp physical max */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): measured value */  \
+  { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): min measured value */  \
+  { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x8000) }, /* Temperature Measurement (server): max measured value */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* IAS Zone (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* IAS Zone (server): zone state */  \
+  { 0x0001, ZAP_TYPE(ENUM16), 2, 0, ZAP_EMPTY_DEFAULT() }, /* IAS Zone (server): zone type */  \
+  { 0x0002, ZAP_TYPE(BITMAP16), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* IAS Zone (server): zone status */  \
+  { 0x0010, ZAP_TYPE(IEEE_ADDRESS), 8, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_LONG_DEFAULTS_INDEX(498) }, /* IAS Zone (server): IAS CIE address */  \
+  { 0x0011, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xff) }, /* IAS Zone (server): Zone ID */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Low Power (server): cluster revision */  \
+  { 0x0000, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(506) }, /* Application Basic (server): vendor name */  \
+  { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Application Basic (server): vendor id */  \
+  { 0x0002, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(538) }, /* Application Basic (server): application name */  \
+  { 0x0003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Application Basic (server): product id */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (server): cluster revision */  \
+  { 0x0005, ZAP_TYPE(OCTET_STRING), 32, 0, ZAP_LONG_DEFAULTS_INDEX(570) }, /* Application Basic (server): application id */  \
+  { 0x0006, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Application Basic (server): catalog vendor id */  \
+  { 0x0007, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* Application Basic (server): application satus */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS                                                                                                  \
-    const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {                                                          \
-        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,                                                  \
-        (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerAttributeChangedCallback,                                      \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = {                                                            \
-        (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback,                                                    \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {                                                            \
-        (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,                                                    \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
-        (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {                                                      \
-        (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,                                              \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayDoorLockServer[] = {                                                          \
-        (EmberAfGenericClusterFunction) emberAfDoorLockClusterServerAttributeChangedCallback,                                      \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayColorControlServer[] = {                                                      \
-        (EmberAfGenericClusterFunction) emberAfColorControlClusterServerInitCallback,                                              \
-    };                                                                                                                             \
-    const EmberAfGenericClusterFunction chipFuncArrayIasZoneServer[] = {                                                           \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerInitCallback,                                                   \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerMessageSentCallback,                                            \
-        (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerPreAttributeChangedCallback,                                    \
-    };
-
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+#define GENERATED_FUNCTION_ARRAYS   \
+const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerInitCallback,\
+  (EmberAfGenericClusterFunction) emberAfIdentifyClusterServerAttributeChangedCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfGroupsClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayLevelControlServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfLevelControlClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayDoorLockServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfDoorLockClusterServerAttributeChangedCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayColorControlServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfColorControlClusterServerInitCallback,\
+};\
+const EmberAfGenericClusterFunction chipFuncArrayIasZoneServer[] = {\
+  (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerInitCallback,\
+  (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerMessageSentCallback,\
+  (EmberAfGenericClusterFunction) emberAfIasZoneClusterServerPreAttributeChangedCallback,\
+};\
+
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT 17
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003,                                                                                                                  \
-          ZAP_ATTRIBUTE_INDEX(0),                                                                                                  \
-          2,                                                                                                                       \
-          4,                                                                                                                       \
-          ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION),               \
-          chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */                                             \
-            { 0x0004,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(2),                                                                                              \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */                                             \
-            { 0x0005,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(4),                                                                                              \
-              6,                                                                                                                   \
-              8,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */                                             \
-            { 0x0006,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(10),                                                                                             \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */                                              \
-            { 0x0008,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(12),                                                                                             \
-              2,                                                                                                                   \
-              3,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */                                \
-            {                                                                                                                      \
-                0x0028, ZAP_ATTRIBUTE_INDEX(14), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL                                           \
-            }, /* Endpoint: 1, Cluster: Basic (server) */                                                                          \
-            {                                                                                                                      \
-                0x0031, ZAP_ATTRIBUTE_INDEX(26), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Network Commissioning (server) */                                                          \
-            {                                                                                                                      \
-                0x0101, ZAP_ATTRIBUTE_INDEX(27), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Door Lock (client) */                                                                      \
-            { 0x0101,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(28),                                                                                             \
-              4,                                                                                                                   \
-              5,                                                                                                                   \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION),                                             \
-              chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */                                        \
-            {                                                                                                                      \
-                0x0103, ZAP_ATTRIBUTE_INDEX(32), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Barrier Control (client) */                                                                \
-            {                                                                                                                      \
-                0x0103, ZAP_ATTRIBUTE_INDEX(33), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Barrier Control (server) */                                                                \
-            {                                                                                                                      \
-                0x0300, ZAP_ATTRIBUTE_INDEX(38), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Color Control (client) */                                                                  \
-            { 0x0300,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(39),                                                                                             \
-              51,                                                                                                                  \
-              336,                                                                                                                 \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION),                                                          \
-              chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */                                \
-            {                                                                                                                      \
-                0x0402, ZAP_ATTRIBUTE_INDEX(90), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                        \
-            { 0x0500,                                                                                                              \
-              ZAP_ATTRIBUTE_INDEX(94),                                                                                             \
-              6,                                                                                                                   \
-              16,                                                                                                                  \
-              ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) |      \
-                  ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION),                                                                         \
-              chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */                                          \
-            {                                                                                                                      \
-                0x0508, ZAP_ATTRIBUTE_INDEX(100), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL                                             \
-            }, /* Endpoint: 1, Cluster: Low Power (server) */                                                                      \
-            {                                                                                                                      \
-                0x050D, ZAP_ATTRIBUTE_INDEX(101), 8, 105, ZAP_CLUSTER_MASK(SERVER), NULL                                           \
-            }, /* Endpoint: 1, Cluster: Application Basic (server) */                                                              \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_CLUSTERS { \
+  { 0x0003, ZAP_ATTRIBUTE_INDEX(0), 2, 4, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), chipFuncArrayIdentifyServer }, /* Endpoint: 1, Cluster: Identify (server) */ \
+  { 0x0004, ZAP_ATTRIBUTE_INDEX(2), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayGroupsServer }, /* Endpoint: 1, Cluster: Groups (server) */ \
+  { 0x0005, ZAP_ATTRIBUTE_INDEX(4), 6, 8, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayScenesServer }, /* Endpoint: 1, Cluster: Scenes (server) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(10), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayOnOffServer }, /* Endpoint: 1, Cluster: On/off (server) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(12), 2, 3, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayLevelControlServer }, /* Endpoint: 1, Cluster: Level Control (server) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(14), 12, 254, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Basic (server) */ \
+  { 0x0031, ZAP_ATTRIBUTE_INDEX(26), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Network Commissioning (server) */ \
+  { 0x0101, ZAP_ATTRIBUTE_INDEX(27), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Door Lock (client) */ \
+  { 0x0101, ZAP_ATTRIBUTE_INDEX(28), 4, 5, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \
+  { 0x0103, ZAP_ATTRIBUTE_INDEX(32), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Barrier Control (client) */ \
+  { 0x0103, ZAP_ATTRIBUTE_INDEX(33), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \
+  { 0x0300, ZAP_ATTRIBUTE_INDEX(38), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Color Control (client) */ \
+  { 0x0300, ZAP_ATTRIBUTE_INDEX(39), 51, 336, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \
+  { 0x0402, ZAP_ATTRIBUTE_INDEX(90), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
+  { 0x0500, ZAP_ATTRIBUTE_INDEX(94), 6, 16, ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \
+  { 0x0508, ZAP_ATTRIBUTE_INDEX(100), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Low Power (server) */ \
+  { 0x050D, ZAP_ATTRIBUTE_INDEX(101), 8, 105, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 1, Cluster: Application Basic (server) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 17, 762 },                                                                                         \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 17, 762 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (255)
@@ -468,317 +320,197 @@
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0001                                                                                                                     \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0001 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0103                                                                                                                     \
-    }
+#define FIXED_PROFILE_IDS { 0x0103 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_DEVICE_IDS { 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1                                                                                                                          \
-    }
+#define FIXED_DEVICE_VERSIONS { 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_ENDPOINT_TYPES { 0 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        1                                                                                                                          \
-    }
+#define FIXED_NETWORKS { 1 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (143)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) },     /* Identify (server): Identify */                                 \
-            { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (server): IdentifyQueryResponse */                    \
-            { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (server): IdentifyQuery */                            \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroup */                                   \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): AddGroupResponse */                           \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): ViewGroup */                                  \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): ViewGroupResponse */                          \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): GetGroupMembership */                         \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): GetGroupMembershipResponse */                 \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveGroup */                                \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): RemoveGroupResponse */                        \
-            { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveAllGroups */                            \
-            { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroupIfIdentifying */                      \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): AddScene */                                   \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): AddSceneResponse */                           \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): ViewScene */                                  \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): ViewSceneResponse */                          \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveScene */                                \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveSceneResponse */                        \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveAllScenes */                            \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveAllScenesResponse */                    \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): StoreScene */                                 \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): StoreSceneResponse */                         \
-            { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RecallScene */                                \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): GetSceneMembership */                         \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): GetSceneMembershipResponse */                 \
-            { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */                                        \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */                                         \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */                                     \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */                         \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */                                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */                       \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */                                       \
-            { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */                \
-            { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */        \
-            { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */              \
-            { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */      \
-            { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */           \
-            { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */   \
-            { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */            \
-            { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */    \
-            { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */         \
-            { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
-            { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */               \
-            { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */       \
-            { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */               \
-            { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */       \
-            { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */              \
-            { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */      \
-            { 0x0031, 0x10,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */         \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): LockDoor */                                \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): LockDoorResponse */                        \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): LockDoor */                                \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): LockDoorResponse */                        \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): UnlockDoor */                              \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): UnlockDoorResponse */                      \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): UnlockDoor */                              \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): UnlockDoorResponse */                      \
-            { 0x0101, 0x03,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeout */ \
-            { 0x0101, 0x03,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): UnlockWithTimeout */ \
-            { 0x0101, 0x04,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecord */      \
-            { 0x0101, 0x04,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetLogRecord */      \
-            { 0x0101, 0x05,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPin */            \
-            { 0x0101, 0x05,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetPin */            \
-            { 0x0101, 0x06,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPin */            \
-            { 0x0101, 0x06,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetPin */            \
-            { 0x0101, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPin */          \
-            { 0x0101, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearPin */          \
-            { 0x0101, 0x08,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPins */      \
-            { 0x0101, 0x08,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllPins */      \
-            {                                                                                                                      \
-                0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): SetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): GetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearWeekdaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): ClearWeekdaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): SetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): GetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearYeardaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): ClearYeardaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): SetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): GetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearHolidaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Door Lock (server): ClearHolidaySchedule */                                                                      \
-            { 0x0101, 0x14,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserType */       \
-            { 0x0101, 0x14,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetUserType */       \
-            { 0x0101, 0x15,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserType */       \
-            { 0x0101, 0x15,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetUserType */       \
-            { 0x0101, 0x16,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfid */           \
-            { 0x0101, 0x16,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetRfid */           \
-            { 0x0101, 0x17,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfid */           \
-            { 0x0101, 0x17,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetRfid */           \
-            { 0x0101, 0x18,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfid */         \
-            { 0x0101, 0x18,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearRfid */         \
-            { 0x0101, 0x19,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfids */     \
-            { 0x0101, 0x19,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllRfids */     \
-            { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlGoToPercent */         \
-            { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlGoToPercent */         \
-            { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlStop */                \
-            { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlStop */                \
-            { 0x0300, 0x00,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHue */     \
-            { 0x0300, 0x00,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToHue */     \
-            { 0x0300, 0x01,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveHue */       \
-            { 0x0300, 0x01,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveHue */       \
-            { 0x0300, 0x02,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepHue */       \
-            { 0x0300, 0x02,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepHue */       \
-            {                                                                                                                      \
-                0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveToSaturation */                                                                      \
-            {                                                                                                                      \
-                0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveToSaturation */                                                                      \
-            {                                                                                                                      \
-                0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): StepSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): StepSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveToHueAndSaturation */                                                                \
-            {                                                                                                                      \
-                0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            },                                                   /* Color Control (server): MoveToHueAndSaturation */              \
-            { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveToColor */                         \
-            { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveToColor */                         \
-            { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveColor */                           \
-            { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveColor */                           \
-            { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): StepColor */                           \
-            { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): StepColor */                           \
-            {                                                                                                                      \
-                0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveToColorTemperature */                                                                \
-            {                                                                                                                      \
-                0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveToColorTemperature */                                                                \
-            { 0x0300, 0x47,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StopMoveStep */  \
-            { 0x0300, 0x47,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StopMoveStep */  \
-            {                                                                                                                      \
-                0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveColorTemperature */                                                                  \
-            {                                                                                                                      \
-                0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            }, /* Color Control (server): MoveColorTemperature */                                                                  \
-            {                                                                                                                      \
-                0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): StepColorTemperature */                                                                  \
-            {                                                                                                                      \
-                0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER)                                \
-            },                                                   /* Color Control (server): StepColorTemperature */                \
-            { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* IAS Zone (server): ZoneEnrollResponse */                       \
-            { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneStatusChangeNotification */             \
-            { 0x0500, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneEnrollRequest */                        \
-            { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (server): Sleep */                                   \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (server): Identify */ \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (server): IdentifyQueryResponse */ \
+  { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (server): IdentifyQuery */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroup */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): AddGroupResponse */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): ViewGroup */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): ViewGroupResponse */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): GetGroupMembership */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): GetGroupMembershipResponse */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveGroup */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (server): RemoveGroupResponse */ \
+  { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): RemoveAllGroups */ \
+  { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (server): AddGroupIfIdentifying */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): AddScene */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): AddSceneResponse */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): ViewScene */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): ViewSceneResponse */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveScene */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveSceneResponse */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RemoveAllScenes */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): RemoveAllScenesResponse */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): StoreScene */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): StoreSceneResponse */ \
+  { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): RecallScene */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (server): GetSceneMembership */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (server): GetSceneMembershipResponse */ \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Off */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): On */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (server): Toggle */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevel */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Move */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Step */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): Stop */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): MoveWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StepWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (server): StopWithOnOff */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (server): Leave */ \
+  { 0x0031, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): ScanNetworks */ \
+  { 0x0031, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): ScanNetworksResponse */ \
+  { 0x0031, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddWiFiNetwork */ \
+  { 0x0031, 0x03, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddWiFiNetworkResponse */ \
+  { 0x0031, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetwork */ \
+  { 0x0031, 0x05, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateWiFiNetworkResponse */ \
+  { 0x0031, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): AddThreadNetwork */ \
+  { 0x0031, 0x07, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): AddThreadNetworkResponse */ \
+  { 0x0031, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetwork */ \
+  { 0x0031, 0x09, ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Network Commissioning (server): UpdateThreadNetworkResponse */ \
+  { 0x0031, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): RemoveNetwork */ \
+  { 0x0031, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): RemoveNetworkResponse */ \
+  { 0x0031, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): EnableNetwork */ \
+  { 0x0031, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): EnableNetworkResponse */ \
+  { 0x0031, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): DisableNetwork */ \
+  { 0x0031, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Network Commissioning (server): DisableNetworkResponse */ \
+  { 0x0031, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Network Commissioning (server): GetLastNetworkCommissioningResult */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): LockDoor */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): LockDoorResponse */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): LockDoor */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): LockDoorResponse */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): UnlockDoor */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): UnlockDoorResponse */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (server): UnlockDoor */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (server): UnlockDoorResponse */ \
+  { 0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeout */ \
+  { 0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): UnlockWithTimeout */ \
+  { 0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecord */ \
+  { 0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetLogRecord */ \
+  { 0x0101, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPin */ \
+  { 0x0101, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetPin */ \
+  { 0x0101, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPin */ \
+  { 0x0101, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetPin */ \
+  { 0x0101, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPin */ \
+  { 0x0101, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearPin */ \
+  { 0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPins */ \
+  { 0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllPins */ \
+  { 0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetWeekdaySchedule */ \
+  { 0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetWeekdaySchedule */ \
+  { 0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetWeekdaySchedule */ \
+  { 0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetWeekdaySchedule */ \
+  { 0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearWeekdaySchedule */ \
+  { 0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearWeekdaySchedule */ \
+  { 0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetYeardaySchedule */ \
+  { 0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetYeardaySchedule */ \
+  { 0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetYeardaySchedule */ \
+  { 0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetYeardaySchedule */ \
+  { 0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearYeardaySchedule */ \
+  { 0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearYeardaySchedule */ \
+  { 0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetHolidaySchedule */ \
+  { 0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetHolidaySchedule */ \
+  { 0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetHolidaySchedule */ \
+  { 0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetHolidaySchedule */ \
+  { 0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearHolidaySchedule */ \
+  { 0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearHolidaySchedule */ \
+  { 0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserType */ \
+  { 0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetUserType */ \
+  { 0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserType */ \
+  { 0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetUserType */ \
+  { 0x0101, 0x16, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfid */ \
+  { 0x0101, 0x16, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): SetRfid */ \
+  { 0x0101, 0x17, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfid */ \
+  { 0x0101, 0x17, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): GetRfid */ \
+  { 0x0101, 0x18, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfid */ \
+  { 0x0101, 0x18, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearRfid */ \
+  { 0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfids */ \
+  { 0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Door Lock (server): ClearAllRfids */ \
+  { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlGoToPercent */ \
+  { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlGoToPercent */ \
+  { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlStop */ \
+  { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (server): BarrierControlStop */ \
+  { 0x0300, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHue */ \
+  { 0x0300, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToHue */ \
+  { 0x0300, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveHue */ \
+  { 0x0300, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveHue */ \
+  { 0x0300, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepHue */ \
+  { 0x0300, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepHue */ \
+  { 0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToSaturation */ \
+  { 0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToSaturation */ \
+  { 0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveSaturation */ \
+  { 0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveSaturation */ \
+  { 0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepSaturation */ \
+  { 0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepSaturation */ \
+  { 0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHueAndSaturation */ \
+  { 0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToHueAndSaturation */ \
+  { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveToColor */ \
+  { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveToColor */ \
+  { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveColor */ \
+  { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): MoveColor */ \
+  { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): StepColor */ \
+  { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (server): StepColor */ \
+  { 0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToColorTemperature */ \
+  { 0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveToColorTemperature */ \
+  { 0x0300, 0x47, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StopMoveStep */ \
+  { 0x0300, 0x47, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StopMoveStep */ \
+  { 0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveColorTemperature */ \
+  { 0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): MoveColorTemperature */ \
+  { 0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepColorTemperature */ \
+  { 0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_SERVER) | ZAP_COMMAND_MASK(OUTGOING_SERVER) }, /* Color Control (server): StepColorTemperature */ \
+  { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* IAS Zone (server): ZoneEnrollResponse */ \
+  { 0x0500, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneStatusChangeNotification */ \
+  { 0x0500, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* IAS Zone (server): ZoneEnrollRequest */ \
+  { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (server): Sleep */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
@@ -786,33 +518,16 @@
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
 #define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (9)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }          \
-        }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */                                                \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */                              \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0101, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Door Lock", attribute: "lock state". side: server */                                     \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current hue". side: server */                                \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0001, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current saturation". side: server */                         \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0003, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current x". side: server */                                  \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0004, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "current y". side: server */                                  \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0007, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Color Control", attribute: "color temperature". side: server */                          \
-            {                                                                                                                      \
-                ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0402, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, { { 0, 65344, 0 } }      \
-            }, /* Reporting for cluster: "Temperature Measurement", attribute: "measured value". side: server */                   \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0006, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "On/off", attribute: "on/off". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0008, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Level Control", attribute: "current level". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0101, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Door Lock", attribute: "lock state". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current hue". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0001, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current saturation". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0003, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current x". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0004, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "current y". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0300, 0x0007, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Color Control", attribute: "color temperature". side: server */ \
+  { ZAP_REPORT_DIRECTION(REPORTED), 0x0001, 0x0402, 0x0000, ZAP_CLUSTER_MASK(SERVER), 0x0000, {{ 0, 65344, 0 }} }, /* Reporting for cluster: "Temperature Measurement", attribute: "measured value". side: server */ \
+}
+
+
diff --git a/examples/tv-app/tv-common/gen/enums.h b/examples/tv-app/tv-common/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/examples/tv-app/tv-common/gen/enums.h
+++ b/examples/tv-app/tv-common/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/examples/tv-app/tv-common/gen/gen_config.h b/examples/tv-app/tv-common/gen/gen_config.h
index 01c66175df98fb..6fa5f272c30c8c 100644
--- a/examples/tv-app/tv-common/gen/gen_config.h
+++ b/examples/tv-app/tv-common/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
diff --git a/examples/tv-app/tv-common/gen/print-cluster.h b/examples/tv-app/tv-common/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/examples/tv-app/tv-common/gen/print-cluster.h
+++ b/examples/tv-app/tv-common/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52
diff --git a/src/app/chip-zcl-zpro-codec-api.h b/src/app/chip-zcl-zpro-codec-api.h
index 1f252a6411ac83..c2a5ce4e051f00 100644
--- a/src/app/chip-zcl-zpro-codec-api.h
+++ b/src/app/chip-zcl-zpro-codec-api.h
@@ -67,64 +67,55 @@
  * @brief
  *    Encode a Application Basic server discover command into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterDiscoverAttributes(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterDiscoverAttributes(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the vendor name attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadVendorNameAttribute(uint8_t seqNum,
-                                                                                      chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadVendorNameAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the vendor id attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadVendorIdAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadVendorIdAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the application name attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadApplicationNameAttribute(uint8_t seqNum,
-                                                                                           chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadApplicationNameAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the product id attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadProductIdAttribute(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadProductIdAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the application id attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadApplicationIdAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadApplicationIdAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the catalog vendor id attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadCatalogVendorIdAttribute(uint8_t seqNum,
-                                                                                           chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadCatalogVendorIdAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the application satus attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadApplicationSatusAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadApplicationSatusAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Application Basic server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeApplicationBasicClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                           chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeApplicationBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster BarrierControl                                              | 0x0103 |
@@ -145,58 +136,49 @@ chip::System::PacketBufferHandle encodeApplicationBasicClusterReadClusterRevisio
  * @brief
  *    Encode an BarrierControlGoToPercent command for Barrier Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterBarrierControlGoToPercentCommand(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint,
-                                                                                             uint8_t percentOpen);
+chip::System::PacketBufferHandle encodeBarrierControlClusterBarrierControlGoToPercentCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t percentOpen);
 
 /**
  * @brief
  *    Encode an BarrierControlStop command for Barrier Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterBarrierControlStopCommand(uint8_t seqNum,
-                                                                                      chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBarrierControlClusterBarrierControlStopCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Barrier Control server discover command into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterDiscoverAttributes(uint8_t seqNum,
-                                                                               chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBarrierControlClusterDiscoverAttributes(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Barrier Control server read command for the barrier moving state attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierMovingStateAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierMovingStateAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Barrier Control server read command for the barrier safety status attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierSafetyStatusAttribute(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierSafetyStatusAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Barrier Control server read command for the barrier capabilities attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierCapabilitiesAttribute(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierCapabilitiesAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Barrier Control server read command for the barrier position attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierPositionAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBarrierControlClusterReadBarrierPositionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Barrier Control server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBarrierControlClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBarrierControlClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster Basic                                                       | 0x0028 |
@@ -235,8 +217,7 @@ chip::System::PacketBufferHandle encodeBasicClusterDiscoverAttributes(uint8_t se
  * @brief
  *    Encode a Basic server read command for the InteractionModelVersion attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterReadInteractionModelVersionAttribute(uint8_t seqNum,
-                                                                                        chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBasicClusterReadInteractionModelVersionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
@@ -272,8 +253,7 @@ chip::System::PacketBufferHandle encodeBasicClusterReadUserLabelAttribute(uint8_
  * @brief
  *    Encode a Basic server write command for the UserLabel attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                           chip::ByteSpan userLabel);
+chip::System::PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan userLabel);
 
 /**
  * @brief
@@ -285,43 +265,37 @@ chip::System::PacketBufferHandle encodeBasicClusterReadLocationAttribute(uint8_t
  * @brief
  *    Encode a Basic server write command for the Location attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterWriteLocationAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                          chip::ByteSpan location);
+chip::System::PacketBufferHandle encodeBasicClusterWriteLocationAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan location);
 
 /**
  * @brief
  *    Encode a Basic server read command for the HardwareVersion attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterReadHardwareVersionAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBasicClusterReadHardwareVersionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Basic server read command for the HardwareVersionString attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterReadHardwareVersionStringAttribute(uint8_t seqNum,
-                                                                                      chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBasicClusterReadHardwareVersionStringAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Basic server read command for the SoftwareVersion attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterReadSoftwareVersionAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBasicClusterReadSoftwareVersionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Basic server read command for the SoftwareVersionString attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterReadSoftwareVersionStringAttribute(uint8_t seqNum,
-                                                                                      chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBasicClusterReadSoftwareVersionStringAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Basic server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBasicClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster Binding                                                     | 0xF000 |
@@ -338,17 +312,13 @@ chip::System::PacketBufferHandle encodeBasicClusterReadClusterRevisionAttribute(
  * @brief
  *    Encode an Bind command for Binding server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBindingClusterBindCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                 chip::NodeId nodeId, chip::GroupId groupId,
-                                                                 chip::EndpointId endpointId, chip::ClusterId clusterId);
+chip::System::PacketBufferHandle encodeBindingClusterBindCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
 
 /**
  * @brief
  *    Encode an Unbind command for Binding server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBindingClusterUnbindCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                   chip::NodeId nodeId, chip::GroupId groupId,
-                                                                   chip::EndpointId endpointId, chip::ClusterId clusterId);
+chip::System::PacketBufferHandle encodeBindingClusterUnbindCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
 
 /**
  * @brief
@@ -360,8 +330,7 @@ chip::System::PacketBufferHandle encodeBindingClusterDiscoverAttributes(uint8_t
  * @brief
  *    Encode a Binding server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeBindingClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                  chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeBindingClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster ColorControl                                                | 0x0300 |
@@ -440,119 +409,85 @@ chip::System::PacketBufferHandle encodeBindingClusterReadClusterRevisionAttribut
  * @brief
  *    Encode an MoveColor command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterMoveColorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                           int16_t rateX, int16_t rateY, uint8_t optionsMask,
-                                                                           uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveColorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveColorTemperature command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterMoveColorTemperatureCommand(
-    uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum,
-    uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveColorTemperatureCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveHue command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterMoveHueCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                         uint8_t moveMode, uint8_t rate, uint8_t optionsMask,
-                                                                         uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveHueCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveSaturation command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterMoveSaturationCommand(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint,
-                                                                                uint8_t moveMode, uint8_t rate, uint8_t optionsMask,
-                                                                                uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveSaturationCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveToColor command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterMoveToColorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                             uint16_t colorX, uint16_t colorY,
-                                                                             uint16_t transitionTime, uint8_t optionsMask,
-                                                                             uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveToColorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveToColorTemperature command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterMoveToColorTemperatureCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                       uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask,
-                                                       uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveToColorTemperatureCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveToHue command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterMoveToHueCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                           uint8_t hue, uint8_t direction, uint16_t transitionTime,
-                                                                           uint8_t optionsMask, uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveToHueCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveToHueAndSaturation command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterMoveToHueAndSaturationCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t hue,
-                                                       uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask,
-                                                       uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveToHueAndSaturationCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an MoveToSaturation command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterMoveToSaturationCommand(uint8_t seqNum,
-                                                                                  chip::EndpointId destinationEndpoint,
-                                                                                  uint8_t saturation, uint16_t transitionTime,
-                                                                                  uint8_t optionsMask, uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterMoveToSaturationCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an StepColor command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterStepColorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                           int16_t stepX, int16_t stepY, uint16_t transitionTime,
-                                                                           uint8_t optionsMask, uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterStepColorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an StepColorTemperature command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterStepColorTemperatureCommand(
-    uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime,
-    uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterStepColorTemperatureCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an StepHue command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterStepHueCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                         uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime,
-                                                                         uint8_t optionsMask, uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterStepHueCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an StepSaturation command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterStepSaturationCommand(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint,
-                                                                                uint8_t stepMode, uint8_t stepSize,
-                                                                                uint8_t transitionTime, uint8_t optionsMask,
-                                                                                uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterStepSaturationCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
  *    Encode an StopMoveStep command for Color Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterStopMoveStepCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                              uint8_t optionsMask, uint8_t optionsOverride);
+chip::System::PacketBufferHandle encodeColorControlClusterStopMoveStepCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t optionsMask, uint8_t optionsOverride);
 
 /**
  * @brief
@@ -564,503 +499,415 @@ chip::System::PacketBufferHandle encodeColorControlClusterDiscoverAttributes(uin
  * @brief
  *    Encode a Color Control server read command for the current hue attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentHueAttribute(uint8_t seqNum,
-                                                                                  chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentHueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server configure report command for the current hue attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentHueAttribute(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint,
-                                                                                       uint16_t minInterval, uint16_t maxInterval,
-                                                                                       uint8_t change);
+chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentHueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint8_t change);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the current saturation attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentSaturationAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentSaturationAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
- *    Encode a Color Control server configure report command for the current saturation attribute into buffer including the APS
- * frame
+ *    Encode a Color Control server configure report command for the current saturation attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentSaturationAttribute(uint8_t seqNum,
-                                                                                              chip::EndpointId destinationEndpoint,
-                                                                                              uint16_t minInterval,
-                                                                                              uint16_t maxInterval, uint8_t change);
+chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentSaturationAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint8_t change);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the remaining time attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadRemainingTimeAttribute(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadRemainingTimeAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the current x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentXAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server configure report command for the current x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentXAttribute(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint,
-                                                                                     uint16_t minInterval, uint16_t maxInterval,
-                                                                                     uint16_t change);
+chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint16_t change);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the current y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentYAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadCurrentYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server configure report command for the current y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentYAttribute(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint,
-                                                                                     uint16_t minInterval, uint16_t maxInterval,
-                                                                                     uint16_t change);
+chip::System::PacketBufferHandle encodeColorControlClusterConfigureCurrentYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint16_t change);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the drift compensation attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadDriftCompensationAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadDriftCompensationAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the compensation text attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadCompensationTextAttribute(uint8_t seqNum,
-                                                                                        chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadCompensationTextAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color temperature attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorTemperatureAttribute(uint8_t seqNum,
-                                                                                        chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorTemperatureAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server configure report command for the color temperature attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterConfigureColorTemperatureAttribute(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint,
-                                                                                             uint16_t minInterval,
-                                                                                             uint16_t maxInterval, uint16_t change);
+chip::System::PacketBufferHandle encodeColorControlClusterConfigureColorTemperatureAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint16_t change);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color mode attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorModeAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorModeAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color control options attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorControlOptionsAttribute(uint8_t seqNum,
-                                                                                           chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorControlOptionsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color control options attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterWriteColorControlOptionsAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint,
-                                                                                            uint8_t colorControlOptions);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorControlOptionsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t colorControlOptions);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the number of primaries attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadNumberOfPrimariesAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadNumberOfPrimariesAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 1 x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary1XAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary1XAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 1 y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary1YAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary1YAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 1 intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary1IntensityAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary1IntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 2 x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary2XAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary2XAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 2 y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary2YAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary2YAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 2 intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary2IntensityAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary2IntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 3 x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary3XAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary3XAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 3 y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary3YAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary3YAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 3 intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary3IntensityAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary3IntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 4 x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary4XAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary4XAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 4 y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary4YAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary4YAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 4 intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary4IntensityAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary4IntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 5 x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary5XAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary5XAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 5 y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary5YAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary5YAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 5 intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary5IntensityAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary5IntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 6 x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary6XAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary6XAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 6 y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary6YAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary6YAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the primary 6 intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary6IntensityAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadPrimary6IntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the white point x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadWhitePointXAttribute(uint8_t seqNum,
-                                                                                   chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadWhitePointXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the white point x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteWhitePointXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t whitePointX);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteWhitePointXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t whitePointX);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the white point y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadWhitePointYAttribute(uint8_t seqNum,
-                                                                                   chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadWhitePointYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the white point y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteWhitePointYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t whitePointY);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteWhitePointYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t whitePointY);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point r x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointRXAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointRXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point r x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteColorPointRXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointRX);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointRXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointRX);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point r y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointRYAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointRYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point r y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteColorPointRYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointRY);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointRYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointRY);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point r intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointRIntensityAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointRIntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point r intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointRIntensityAttribute(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint,
-                                                                                             uint8_t colorPointRIntensity);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointRIntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t colorPointRIntensity);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point g x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointGXAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointGXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point g x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteColorPointGXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointGX);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointGXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointGX);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point g y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointGYAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointGYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point g y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteColorPointGYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointGY);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointGYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointGY);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point g intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointGIntensityAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointGIntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point g intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointGIntensityAttribute(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint,
-                                                                                             uint8_t colorPointGIntensity);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointGIntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t colorPointGIntensity);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point b x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointBXAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointBXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point b x attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteColorPointBXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointBX);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointBXAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointBX);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point b y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointBYAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointBYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point b y attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteColorPointBYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointBY);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointBYAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t colorPointBY);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color point b intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointBIntensityAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorPointBIntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server write command for the color point b intensity attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointBIntensityAttribute(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint,
-                                                                                             uint8_t colorPointBIntensity);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteColorPointBIntensityAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t colorPointBIntensity);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the enhanced current hue attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadEnhancedCurrentHueAttribute(uint8_t seqNum,
-                                                                                          chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadEnhancedCurrentHueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the enhanced color mode attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadEnhancedColorModeAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadEnhancedColorModeAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color loop active attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorLoopActiveAttribute(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorLoopActiveAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color loop direction attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorLoopDirectionAttribute(uint8_t seqNum,
-                                                                                          chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorLoopDirectionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color loop time attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorLoopTimeAttribute(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorLoopTimeAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color capabilities attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorCapabilitiesAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorCapabilitiesAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color temp physical min attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMinAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMinAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the color temp physical max attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMaxAttribute(uint8_t seqNum,
-                                                                                            chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMaxAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
- *    Encode a Color Control server read command for the couple color temp to level min-mireds attribute into buffer including the
- * APS frame
+ *    Encode a Color Control server read command for the couple color temp to level min-mireds attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterReadCoupleColorTempToLevelMinMiredsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadCoupleColorTempToLevelMinMiredsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
- *    Encode a Color Control server read command for the start up color temperature mireds attribute into buffer including the APS
- * frame
+ *    Encode a Color Control server read command for the start up color temperature mireds attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterReadStartUpColorTemperatureMiredsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadStartUpColorTemperatureMiredsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
- *    Encode a Color Control server write command for the start up color temperature mireds attribute into buffer including the APS
- * frame
+ *    Encode a Color Control server write command for the start up color temperature mireds attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeColorControlClusterWriteStartUpColorTemperatureMiredsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                     uint16_t startUpColorTemperatureMireds);
+chip::System::PacketBufferHandle encodeColorControlClusterWriteStartUpColorTemperatureMiredsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t startUpColorTemperatureMireds);
 
 /**
  * @brief
  *    Encode a Color Control server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeColorControlClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeColorControlClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster DoorLock                                                    | 0x0101 |
@@ -1113,159 +960,127 @@ chip::System::PacketBufferHandle encodeDoorLockClusterClearAllRfidsCommand(uint8
  * @brief
  *    Encode an ClearHolidaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeDoorLockClusterClearHolidayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId);
+chip::System::PacketBufferHandle encodeDoorLockClusterClearHolidayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId);
 
 /**
  * @brief
  *    Encode an ClearPin command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterClearPinCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                      uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterClearPinCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId);
 
 /**
  * @brief
  *    Encode an ClearRfid command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterClearRfidCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                       uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterClearRfidCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId);
 
 /**
  * @brief
  *    Encode an ClearWeekdaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterClearWeekdayScheduleCommand(uint8_t seqNum,
-                                                                                  chip::EndpointId destinationEndpoint,
-                                                                                  uint8_t scheduleId, uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterClearWeekdayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId);
 
 /**
  * @brief
  *    Encode an ClearYeardaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterClearYeardayScheduleCommand(uint8_t seqNum,
-                                                                                  chip::EndpointId destinationEndpoint,
-                                                                                  uint8_t scheduleId, uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterClearYeardayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId);
 
 /**
  * @brief
  *    Encode an GetHolidaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeDoorLockClusterGetHolidayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId);
+chip::System::PacketBufferHandle encodeDoorLockClusterGetHolidayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId);
 
 /**
  * @brief
  *    Encode an GetLogRecord command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterGetLogRecordCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                          uint16_t logIndex);
+chip::System::PacketBufferHandle encodeDoorLockClusterGetLogRecordCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t logIndex);
 
 /**
  * @brief
  *    Encode an GetPin command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterGetPinCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                    uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterGetPinCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId);
 
 /**
  * @brief
  *    Encode an GetRfid command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterGetRfidCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                     uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterGetRfidCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId);
 
 /**
  * @brief
  *    Encode an GetUserType command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterGetUserTypeCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                         uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterGetUserTypeCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId);
 
 /**
  * @brief
  *    Encode an GetWeekdaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterGetWeekdayScheduleCommand(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint,
-                                                                                uint8_t scheduleId, uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterGetWeekdayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId);
 
 /**
  * @brief
  *    Encode an GetYeardaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterGetYeardayScheduleCommand(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint,
-                                                                                uint8_t scheduleId, uint16_t userId);
+chip::System::PacketBufferHandle encodeDoorLockClusterGetYeardayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId);
 
 /**
  * @brief
  *    Encode an LockDoor command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterLockDoorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                      chip::ByteSpan pin);
+chip::System::PacketBufferHandle encodeDoorLockClusterLockDoorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan pin);
 
 /**
  * @brief
  *    Encode an SetHolidaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeDoorLockClusterSetHolidayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId,
-                                               uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
+chip::System::PacketBufferHandle encodeDoorLockClusterSetHolidayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
 
 /**
  * @brief
  *    Encode an SetPin command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterSetPinCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                    uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                                    chip::ByteSpan pin);
+chip::System::PacketBufferHandle encodeDoorLockClusterSetPinCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin);
 
 /**
  * @brief
  *    Encode an SetRfid command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterSetRfidCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                     uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                                     chip::ByteSpan id);
+chip::System::PacketBufferHandle encodeDoorLockClusterSetRfidCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan id);
 
 /**
  * @brief
  *    Encode an SetUserType command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterSetUserTypeCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                         uint16_t userId, uint8_t userType);
+chip::System::PacketBufferHandle encodeDoorLockClusterSetUserTypeCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t userId, uint8_t userType);
 
 /**
  * @brief
  *    Encode an SetWeekdaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeDoorLockClusterSetWeekdayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId,
-                                               uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute,
-                                               uint8_t endHour, uint8_t endMinute);
+chip::System::PacketBufferHandle encodeDoorLockClusterSetWeekdayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
 /**
  * @brief
  *    Encode an SetYeardaySchedule command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterSetYeardayScheduleCommand(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint,
-                                                                                uint8_t scheduleId, uint16_t userId,
-                                                                                uint32_t localStartTime, uint32_t localEndTime);
+chip::System::PacketBufferHandle encodeDoorLockClusterSetYeardayScheduleCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime);
 
 /**
  * @brief
  *    Encode an UnlockDoor command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterUnlockDoorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                        chip::ByteSpan pin);
+chip::System::PacketBufferHandle encodeDoorLockClusterUnlockDoorCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan pin);
 
 /**
  * @brief
  *    Encode an UnlockWithTimeout command for Door Lock server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterUnlockWithTimeoutCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                               uint16_t timeoutInSeconds, chip::ByteSpan pin);
+chip::System::PacketBufferHandle encodeDoorLockClusterUnlockWithTimeoutCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t timeoutInSeconds, chip::ByteSpan pin);
 
 /**
  * @brief
@@ -1283,9 +1098,7 @@ chip::System::PacketBufferHandle encodeDoorLockClusterReadLockStateAttribute(uin
  * @brief
  *    Encode a Door Lock server configure report command for the lock state attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterConfigureLockStateAttribute(uint8_t seqNum,
-                                                                                  chip::EndpointId destinationEndpoint,
-                                                                                  uint16_t minInterval, uint16_t maxInterval);
+chip::System::PacketBufferHandle encodeDoorLockClusterConfigureLockStateAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval);
 
 /**
  * @brief
@@ -1297,15 +1110,13 @@ chip::System::PacketBufferHandle encodeDoorLockClusterReadLockTypeAttribute(uint
  * @brief
  *    Encode a Door Lock server read command for the actuator enabled attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterReadActuatorEnabledAttribute(uint8_t seqNum,
-                                                                                   chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeDoorLockClusterReadActuatorEnabledAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Door Lock server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeDoorLockClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                   chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeDoorLockClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster GeneralCommissioning                                        | 0x0030 |
@@ -1325,61 +1136,49 @@ chip::System::PacketBufferHandle encodeDoorLockClusterReadClusterRevisionAttribu
  * @brief
  *    Encode an ArmFailSafe command for General Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGeneralCommissioningClusterArmFailSafeCommand(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint,
-                                                                                     uint16_t expiryLengthSeconds,
-                                                                                     uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterArmFailSafeCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an CommissioningComplete command for General Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeGeneralCommissioningClusterCommissioningCompleteCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterCommissioningCompleteCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode an SetFabric command for General Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeGeneralCommissioningClusterSetFabricCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan fabricId,
-                                                  chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterSetFabricCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode a General Commissioning server discover command into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGeneralCommissioningClusterDiscoverAttributes(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterDiscoverAttributes(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a General Commissioning server read command for the FabricId attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGeneralCommissioningClusterReadFabricIdAttribute(uint8_t seqNum,
-                                                                                        chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterReadFabricIdAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a General Commissioning server read command for the Breadcrumb attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGeneralCommissioningClusterReadBreadcrumbAttribute(uint8_t seqNum,
-                                                                                          chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterReadBreadcrumbAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a General Commissioning server write command for the Breadcrumb attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(uint8_t seqNum,
-                                                                                           chip::EndpointId destinationEndpoint,
-                                                                                           uint64_t breadcrumb);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint64_t breadcrumb);
 
 /**
  * @brief
  *    Encode a General Commissioning server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeGeneralCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGeneralCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster GroupKeyManagement                                          | 0xF004 |
@@ -1396,29 +1195,25 @@ encodeGeneralCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, ch
  * @brief
  *    Encode a Group Key Management server discover command into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupKeyManagementClusterDiscoverAttributes(uint8_t seqNum,
-                                                                                   chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGroupKeyManagementClusterDiscoverAttributes(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Group Key Management server read command for the groups attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupKeyManagementClusterReadGroupsAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGroupKeyManagementClusterReadGroupsAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Group Key Management server read command for the group keys attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupKeyManagementClusterReadGroupKeysAttribute(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGroupKeyManagementClusterReadGroupKeysAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Group Key Management server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupKeyManagementClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGroupKeyManagementClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster Groups                                                      | 0x0004 |
@@ -1440,23 +1235,19 @@ chip::System::PacketBufferHandle encodeGroupKeyManagementClusterReadClusterRevis
  * @brief
  *    Encode an AddGroup command for Groups server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupsClusterAddGroupCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                    uint16_t groupId, chip::ByteSpan groupName);
+chip::System::PacketBufferHandle encodeGroupsClusterAddGroupCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId, chip::ByteSpan groupName);
 
 /**
  * @brief
  *    Encode an AddGroupIfIdentifying command for Groups server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupsClusterAddGroupIfIdentifyingCommand(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint,
-                                                                                 uint16_t groupId, chip::ByteSpan groupName);
+chip::System::PacketBufferHandle encodeGroupsClusterAddGroupIfIdentifyingCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId, chip::ByteSpan groupName);
 
 /**
  * @brief
  *    Encode an GetGroupMembership command for Groups server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupsClusterGetGroupMembershipCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                              uint8_t groupCount, uint16_t groupList);
+chip::System::PacketBufferHandle encodeGroupsClusterGetGroupMembershipCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t groupCount, uint16_t groupList);
 
 /**
  * @brief
@@ -1468,15 +1259,13 @@ chip::System::PacketBufferHandle encodeGroupsClusterRemoveAllGroupsCommand(uint8
  * @brief
  *    Encode an RemoveGroup command for Groups server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupsClusterRemoveGroupCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                       uint16_t groupId);
+chip::System::PacketBufferHandle encodeGroupsClusterRemoveGroupCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId);
 
 /**
  * @brief
  *    Encode an ViewGroup command for Groups server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupsClusterViewGroupCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                     uint16_t groupId);
+chip::System::PacketBufferHandle encodeGroupsClusterViewGroupCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId);
 
 /**
  * @brief
@@ -1494,8 +1283,7 @@ chip::System::PacketBufferHandle encodeGroupsClusterReadNameSupportAttribute(uin
  * @brief
  *    Encode a Groups server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeGroupsClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeGroupsClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster IasZone                                                     | 0x0500 |
@@ -1539,15 +1327,13 @@ chip::System::PacketBufferHandle encodeIasZoneClusterReadZoneStatusAttribute(uin
  * @brief
  *    Encode a IAS Zone server read command for the IAS CIE address attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeIasZoneClusterReadIasCieAddressAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeIasZoneClusterReadIasCieAddressAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a IAS Zone server write command for the IAS CIE address attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeIasZoneClusterWriteIasCieAddressAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint64_t iasCieAddress);
+chip::System::PacketBufferHandle encodeIasZoneClusterWriteIasCieAddressAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint64_t iasCieAddress);
 
 /**
  * @brief
@@ -1559,8 +1345,7 @@ chip::System::PacketBufferHandle encodeIasZoneClusterReadZoneIdAttribute(uint8_t
  * @brief
  *    Encode a IAS Zone server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeIasZoneClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                  chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeIasZoneClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster Identify                                                    | 0x0003 |
@@ -1578,8 +1363,7 @@ chip::System::PacketBufferHandle encodeIasZoneClusterReadClusterRevisionAttribut
  * @brief
  *    Encode an Identify command for Identify server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeIdentifyClusterIdentifyCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                      uint16_t identifyTime);
+chip::System::PacketBufferHandle encodeIdentifyClusterIdentifyCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t identifyTime);
 
 /**
  * @brief
@@ -1597,22 +1381,19 @@ chip::System::PacketBufferHandle encodeIdentifyClusterDiscoverAttributes(uint8_t
  * @brief
  *    Encode a Identify server read command for the identify time attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeIdentifyClusterReadIdentifyTimeAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeIdentifyClusterReadIdentifyTimeAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Identify server write command for the identify time attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeIdentifyClusterWriteIdentifyTimeAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t identifyTime);
+chip::System::PacketBufferHandle encodeIdentifyClusterWriteIdentifyTimeAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t identifyTime);
 
 /**
  * @brief
  *    Encode a Identify server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeIdentifyClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                   chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeIdentifyClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster LevelControl                                                | 0x0008 |
@@ -1636,62 +1417,49 @@ chip::System::PacketBufferHandle encodeIdentifyClusterReadClusterRevisionAttribu
  * @brief
  *    Encode an Move command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterMoveCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                      uint8_t moveMode, uint8_t rate, uint8_t optionMask,
-                                                                      uint8_t optionOverride);
+chip::System::PacketBufferHandle encodeLevelControlClusterMoveCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride);
 
 /**
  * @brief
  *    Encode an MoveToLevel command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterMoveToLevelCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                             uint8_t level, uint16_t transitionTime,
-                                                                             uint8_t optionMask, uint8_t optionOverride);
+chip::System::PacketBufferHandle encodeLevelControlClusterMoveToLevelCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
  * @brief
  *    Encode an MoveToLevelWithOnOff command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterMoveToLevelWithOnOffCommand(uint8_t seqNum,
-                                                                                      chip::EndpointId destinationEndpoint,
-                                                                                      uint8_t level, uint16_t transitionTime);
+chip::System::PacketBufferHandle encodeLevelControlClusterMoveToLevelWithOnOffCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t level, uint16_t transitionTime);
 
 /**
  * @brief
  *    Encode an MoveWithOnOff command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterMoveWithOnOffCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                               uint8_t moveMode, uint8_t rate);
+chip::System::PacketBufferHandle encodeLevelControlClusterMoveWithOnOffCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate);
 
 /**
  * @brief
  *    Encode an Step command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterStepCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                      uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime,
-                                                                      uint8_t optionMask, uint8_t optionOverride);
+chip::System::PacketBufferHandle encodeLevelControlClusterStepCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
 
 /**
  * @brief
  *    Encode an StepWithOnOff command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterStepWithOnOffCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                               uint8_t stepMode, uint8_t stepSize,
-                                                                               uint16_t transitionTime);
+chip::System::PacketBufferHandle encodeLevelControlClusterStepWithOnOffCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime);
 
 /**
  * @brief
  *    Encode an Stop command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterStopCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                      uint8_t optionMask, uint8_t optionOverride);
+chip::System::PacketBufferHandle encodeLevelControlClusterStopCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint8_t optionMask, uint8_t optionOverride);
 
 /**
  * @brief
  *    Encode an StopWithOnOff command for Level Control server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterStopWithOnOffCommand(uint8_t seqNum,
-                                                                               chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeLevelControlClusterStopWithOnOffCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
@@ -1703,24 +1471,19 @@ chip::System::PacketBufferHandle encodeLevelControlClusterDiscoverAttributes(uin
  * @brief
  *    Encode a Level Control server read command for the current level attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterReadCurrentLevelAttribute(uint8_t seqNum,
-                                                                                    chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeLevelControlClusterReadCurrentLevelAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Level Control server configure report command for the current level attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8_t seqNum,
-                                                                                         chip::EndpointId destinationEndpoint,
-                                                                                         uint16_t minInterval, uint16_t maxInterval,
-                                                                                         uint8_t change);
+chip::System::PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint8_t change);
 
 /**
  * @brief
  *    Encode a Level Control server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster LowPower                                                    | 0x0508 |
@@ -1748,8 +1511,7 @@ chip::System::PacketBufferHandle encodeLowPowerClusterDiscoverAttributes(uint8_t
  * @brief
  *    Encode a Low Power server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeLowPowerClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                   chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeLowPowerClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster NetworkCommissioning                                        | 0x0031 |
@@ -1773,94 +1535,67 @@ chip::System::PacketBufferHandle encodeLowPowerClusterReadClusterRevisionAttribu
  * @brief
  *    Encode an AddThreadNetwork command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeNetworkCommissioningClusterAddThreadNetworkCommand(uint8_t seqNum,
-                                                                                          chip::EndpointId destinationEndpoint,
-                                                                                          chip::ByteSpan operationalDataset,
-                                                                                          uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterAddThreadNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an AddWiFiNetwork command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeNetworkCommissioningClusterAddWiFiNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan ssid,
-                                                       chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterAddWiFiNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an DisableNetwork command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeNetworkCommissioningClusterDisableNetworkCommand(uint8_t seqNum,
-                                                                                        chip::EndpointId destinationEndpoint,
-                                                                                        chip::ByteSpan networkID,
-                                                                                        uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterDisableNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an EnableNetwork command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeNetworkCommissioningClusterEnableNetworkCommand(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint,
-                                                                                       chip::ByteSpan networkID,
-                                                                                       uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterEnableNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an GetLastNetworkCommissioningResult command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeNetworkCommissioningClusterGetLastNetworkCommissioningResultCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                          uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterGetLastNetworkCommissioningResultCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an RemoveNetwork command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeNetworkCommissioningClusterRemoveNetworkCommand(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint,
-                                                                                       chip::ByteSpan networkID,
-                                                                                       uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterRemoveNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an ScanNetworks command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeNetworkCommissioningClusterScanNetworksCommand(uint8_t seqNum,
-                                                                                      chip::EndpointId destinationEndpoint,
-                                                                                      chip::ByteSpan ssid, uint64_t breadcrumb,
-                                                                                      uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterScanNetworksCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an UpdateThreadNetwork command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeNetworkCommissioningClusterUpdateThreadNetworkCommand(uint8_t seqNum,
-                                                                                             chip::EndpointId destinationEndpoint,
-                                                                                             chip::ByteSpan operationalDataset,
-                                                                                             uint64_t breadcrumb,
-                                                                                             uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterUpdateThreadNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode an UpdateWiFiNetwork command for Network Commissioning server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeNetworkCommissioningClusterUpdateWiFiNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan ssid,
-                                                          chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterUpdateWiFiNetworkCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
 /**
  * @brief
  *    Encode a Network Commissioning server discover command into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeNetworkCommissioningClusterDiscoverAttributes(uint8_t seqNum,
-                                                                                     chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterDiscoverAttributes(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Network Commissioning server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeNetworkCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeNetworkCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster OnOff                                                       | 0x0006 |
@@ -1909,15 +1644,13 @@ chip::System::PacketBufferHandle encodeOnOffClusterReadOnOffAttribute(uint8_t se
  * @brief
  *    Encode a On/off server configure report command for the on/off attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeOnOffClusterConfigureOnOffAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                           uint16_t minInterval, uint16_t maxInterval);
+chip::System::PacketBufferHandle encodeOnOffClusterConfigureOnOffAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval);
 
 /**
  * @brief
  *    Encode a On/off server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster Scenes                                                      | 0x0005 |
@@ -1944,52 +1677,43 @@ chip::System::PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(
  * @brief
  *    Encode an AddScene command for Scenes server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterAddSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                    uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                                                    chip::ByteSpan sceneName, chip::ClusterId clusterId,
-                                                                    uint8_t length, uint8_t value);
+chip::System::PacketBufferHandle encodeScenesClusterAddSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::ByteSpan sceneName, chip::ClusterId clusterId, uint8_t length, uint8_t value);
 
 /**
  * @brief
  *    Encode an GetSceneMembership command for Scenes server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterGetSceneMembershipCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                              uint16_t groupId);
+chip::System::PacketBufferHandle encodeScenesClusterGetSceneMembershipCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId);
 
 /**
  * @brief
  *    Encode an RecallScene command for Scenes server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterRecallSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                       uint16_t groupId, uint8_t sceneId, uint16_t transitionTime);
+chip::System::PacketBufferHandle encodeScenesClusterRecallSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime);
 
 /**
  * @brief
  *    Encode an RemoveAllScenes command for Scenes server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterRemoveAllScenesCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                           uint16_t groupId);
+chip::System::PacketBufferHandle encodeScenesClusterRemoveAllScenesCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId);
 
 /**
  * @brief
  *    Encode an RemoveScene command for Scenes server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterRemoveSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                       uint16_t groupId, uint8_t sceneId);
+chip::System::PacketBufferHandle encodeScenesClusterRemoveSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId);
 
 /**
  * @brief
  *    Encode an StoreScene command for Scenes server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterStoreSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                      uint16_t groupId, uint8_t sceneId);
+chip::System::PacketBufferHandle encodeScenesClusterStoreSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId);
 
 /**
  * @brief
  *    Encode an ViewScene command for Scenes server into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterViewSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                     uint16_t groupId, uint8_t sceneId);
+chip::System::PacketBufferHandle encodeScenesClusterViewSceneCommand(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId);
 
 /**
  * @brief
@@ -2031,8 +1755,7 @@ chip::System::PacketBufferHandle encodeScenesClusterReadNameSupportAttribute(uin
  * @brief
  *    Encode a Scenes server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeScenesClusterReadClusterRevisionAttribute(uint8_t seqNum,
-                                                                                 chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeScenesClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /*----------------------------------------------------------------------------*\
 | Cluster TemperatureMeasurement                                      | 0x0402 |
@@ -2050,42 +1773,35 @@ chip::System::PacketBufferHandle encodeScenesClusterReadClusterRevisionAttribute
  * @brief
  *    Encode a Temperature Measurement server discover command into buffer including the APS frame
  */
-chip::System::PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t seqNum,
-                                                                                       chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Temperature Measurement server read command for the measured value attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeTemperatureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeTemperatureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
- *    Encode a Temperature Measurement server configure report command for the measured value attribute into buffer including the
- * APS frame
+ *    Encode a Temperature Measurement server configure report command for the measured value attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeTemperatureMeasurementClusterConfigureMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint,
-                                                                   uint16_t minInterval, uint16_t maxInterval, int16_t change);
+chip::System::PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, int16_t change);
 
 /**
  * @brief
  *    Encode a Temperature Measurement server read command for the min measured value attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeTemperatureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Temperature Measurement server read command for the max measured value attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
 
 /**
  * @brief
  *    Encode a Temperature Measurement server read command for the cluster revision attribute into buffer including the APS frame
  */
-chip::System::PacketBufferHandle
-encodeTemperatureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+chip::System::PacketBufferHandle encodeTemperatureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, chip::EndpointId destinationEndpoint);
+
diff --git a/src/app/encoder.cpp b/src/app/encoder.cpp
index bba2fefef53511..f3b085f0e030a2 100644
--- a/src/app/encoder.cpp
+++ b/src/app/encoder.cpp
@@ -30,8 +30,9 @@ using namespace chip;
 using namespace chip::System;
 using namespace chip::Encoding::LittleEndian;
 
-static uint16_t doEncodeApsFrame(BufferWriter & buf, ClusterId clusterId, EndpointId sourceEndpoint, EndpointId destinationEndpoint,
-                                 EmberApsOption options, GroupId groupId, uint8_t sequence, uint8_t radius, bool isMeasuring)
+static uint16_t doEncodeApsFrame(BufferWriter & buf, ClusterId clusterId, EndpointId sourceEndpoint,
+                                 EndpointId destinationEndpoint, EmberApsOption options, GroupId groupId, uint8_t sequence,
+                                 uint8_t radius, bool isMeasuring)
 {
 
     uint8_t control_byte = 0;
@@ -71,8 +72,8 @@ static uint16_t doEncodeApsFrame(BufferWriter & buf, ClusterId clusterId, Endpoi
 uint16_t encodeApsFrame(uint8_t * buffer, uint16_t buf_length, EmberApsFrame * apsFrame)
 {
     BufferWriter buf(buffer, buf_length);
-    return doEncodeApsFrame(buf, apsFrame->clusterId, apsFrame->sourceEndpoint, apsFrame->destinationEndpoint, apsFrame->options,
-                            apsFrame->groupId, apsFrame->sequence, apsFrame->radius, !buffer);
+    return doEncodeApsFrame(buf, apsFrame->clusterId, apsFrame->sourceEndpoint, apsFrame->destinationEndpoint,
+                            apsFrame->options, apsFrame->groupId, apsFrame->sequence, apsFrame->radius, !buffer);
 }
 
 #define COMMAND_HEADER(name, clusterId)                                                                                            \
@@ -96,6 +97,7 @@ uint16_t encodeApsFrame(uint8_t * buffer, uint16_t buf_length, EmberApsFrame * a
     }                                                                                                                              \
     return buf.Finalize();
 
+
 /*----------------------------------------------------------------------------*\
 | Cluster Name                                                        |   ID   |
 |---------------------------------------------------------------------+--------|
@@ -259,6 +261,7 @@ uint16_t encodeApsFrame(uint8_t * buffer, uint16_t buf_length, EmberApsFrame * a
 
 #define TEMP_MEASUREMENT_CLUSTER_ID 0x0402
 
+
 // TODO: Find a way to calculate maximum message length for clusters
 //       https://github.com/project-chip/connectedhomeip/issues/965
 constexpr uint16_t kMaxBufferSize = 1024;
@@ -295,7 +298,11 @@ constexpr EndpointId kSourceEndpoint = 1;
 PacketBufferHandle encodeApplicationBasicClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverApplicationBasicAttributes", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -305,7 +312,10 @@ PacketBufferHandle encodeApplicationBasicClusterDiscoverAttributes(uint8_t seqNu
 PacketBufferHandle encodeApplicationBasicClusterReadVendorNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicVendorName", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
@@ -315,7 +325,10 @@ PacketBufferHandle encodeApplicationBasicClusterReadVendorNameAttribute(uint8_t
 PacketBufferHandle encodeApplicationBasicClusterReadVendorIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicVendorId", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -325,7 +338,10 @@ PacketBufferHandle encodeApplicationBasicClusterReadVendorIdAttribute(uint8_t se
 PacketBufferHandle encodeApplicationBasicClusterReadApplicationNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicApplicationName", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -335,7 +351,10 @@ PacketBufferHandle encodeApplicationBasicClusterReadApplicationNameAttribute(uin
 PacketBufferHandle encodeApplicationBasicClusterReadProductIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicProductId", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0003);
     COMMAND_FOOTER();
 }
 
@@ -345,7 +364,10 @@ PacketBufferHandle encodeApplicationBasicClusterReadProductIdAttribute(uint8_t s
 PacketBufferHandle encodeApplicationBasicClusterReadApplicationIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicApplicationId", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0005);
     COMMAND_FOOTER();
 }
 
@@ -355,7 +377,10 @@ PacketBufferHandle encodeApplicationBasicClusterReadApplicationIdAttribute(uint8
 PacketBufferHandle encodeApplicationBasicClusterReadCatalogVendorIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicCatalogVendorId", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0006);
     COMMAND_FOOTER();
 }
 
@@ -365,7 +390,10 @@ PacketBufferHandle encodeApplicationBasicClusterReadCatalogVendorIdAttribute(uin
 PacketBufferHandle encodeApplicationBasicClusterReadApplicationSatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicApplicationSatus", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0007);
     COMMAND_FOOTER();
 }
 
@@ -375,7 +403,10 @@ PacketBufferHandle encodeApplicationBasicClusterReadApplicationSatusAttribute(ui
 PacketBufferHandle encodeApplicationBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadApplicationBasicClusterRevision", APPLICATION_BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -397,12 +428,16 @@ PacketBufferHandle encodeApplicationBasicClusterReadClusterRevisionAttribute(uin
 /*
  * Command BarrierControlGoToPercent
  */
-PacketBufferHandle encodeBarrierControlClusterBarrierControlGoToPercentCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                               uint8_t percentOpen)
+PacketBufferHandle encodeBarrierControlClusterBarrierControlGoToPercentCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t percentOpen)
 {
     COMMAND_HEADER("BarrierControlGoToPercent", BARRIER_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID).Put8(percentOpen);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID)
+       .Put8(percentOpen)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -412,14 +447,22 @@ PacketBufferHandle encodeBarrierControlClusterBarrierControlGoToPercentCommand(u
 PacketBufferHandle encodeBarrierControlClusterBarrierControlStopCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("BarrierControlStop", BARRIER_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_BARRIER_CONTROL_STOP_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_BARRIER_CONTROL_STOP_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeBarrierControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverBarrierControlAttributes", BARRIER_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -429,7 +472,10 @@ PacketBufferHandle encodeBarrierControlClusterDiscoverAttributes(uint8_t seqNum,
 PacketBufferHandle encodeBarrierControlClusterReadBarrierMovingStateAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBarrierControlBarrierMovingState", BARRIER_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -439,7 +485,10 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierMovingStateAttribute(ui
 PacketBufferHandle encodeBarrierControlClusterReadBarrierSafetyStatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBarrierControlBarrierSafetyStatus", BARRIER_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -449,7 +498,10 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierSafetyStatusAttribute(u
 PacketBufferHandle encodeBarrierControlClusterReadBarrierCapabilitiesAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBarrierControlBarrierCapabilities", BARRIER_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0003);
     COMMAND_FOOTER();
 }
 
@@ -459,7 +511,10 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierCapabilitiesAttribute(u
 PacketBufferHandle encodeBarrierControlClusterReadBarrierPositionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBarrierControlBarrierPosition", BARRIER_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000A);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x000A);
     COMMAND_FOOTER();
 }
 
@@ -469,7 +524,10 @@ PacketBufferHandle encodeBarrierControlClusterReadBarrierPositionAttribute(uint8
 PacketBufferHandle encodeBarrierControlClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBarrierControlClusterRevision", BARRIER_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -500,14 +558,23 @@ PacketBufferHandle encodeBarrierControlClusterReadClusterRevisionAttribute(uint8
 PacketBufferHandle encodeBasicClusterMfgSpecificPingCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("MfgSpecificPing", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand | (1u << 2)).Put16(0x1002).Put8(seqNum).Put8(ZCL_MFG_SPECIFIC_PING_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand | (1u << 2))
+        .Put16(0x1002)
+       .Put8(seqNum)
+       .Put8(ZCL_MFG_SPECIFIC_PING_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeBasicClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverBasicAttributes", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -517,7 +584,10 @@ PacketBufferHandle encodeBasicClusterDiscoverAttributes(uint8_t seqNum, Endpoint
 PacketBufferHandle encodeBasicClusterReadInteractionModelVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicInteractionModelVersion", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
@@ -527,7 +597,10 @@ PacketBufferHandle encodeBasicClusterReadInteractionModelVersionAttribute(uint8_
 PacketBufferHandle encodeBasicClusterReadVendorNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicVendorName", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -537,7 +610,10 @@ PacketBufferHandle encodeBasicClusterReadVendorNameAttribute(uint8_t seqNum, End
 PacketBufferHandle encodeBasicClusterReadVendorIDAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicVendorID", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -547,7 +623,10 @@ PacketBufferHandle encodeBasicClusterReadVendorIDAttribute(uint8_t seqNum, Endpo
 PacketBufferHandle encodeBasicClusterReadProductNameAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicProductName", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0003);
     COMMAND_FOOTER();
 }
 
@@ -557,7 +636,10 @@ PacketBufferHandle encodeBasicClusterReadProductNameAttribute(uint8_t seqNum, En
 PacketBufferHandle encodeBasicClusterReadProductIDAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicProductID", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0004);
     COMMAND_FOOTER();
 }
 
@@ -567,12 +649,14 @@ PacketBufferHandle encodeBasicClusterReadProductIDAttribute(uint8_t seqNum, Endp
 PacketBufferHandle encodeBasicClusterReadUserLabelAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicUserLabel", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0005);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                             chip::ByteSpan userLabel)
+PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan userLabel)
 {
     COMMAND_HEADER("WriteBasicUserLabel", BASIC_CLUSTER_ID);
     size_t userLabelStrLen = userLabel.size();
@@ -583,12 +667,13 @@ PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, End
     }
 
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0005)
-        .Put8(66)
-        .Put(static_cast<uint8_t>(userLabelStrLen))
-        .Put(userLabel.data(), userLabelStrLen);
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0005)
+       .Put8(66)
+       .Put(static_cast<uint8_t>(userLabelStrLen))
+       .Put(userLabel.data(), userLabelStrLen)
+       ;
     COMMAND_FOOTER();
 }
 
@@ -598,7 +683,10 @@ PacketBufferHandle encodeBasicClusterWriteUserLabelAttribute(uint8_t seqNum, End
 PacketBufferHandle encodeBasicClusterReadLocationAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicLocation", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0006);
     COMMAND_FOOTER();
 }
 
@@ -613,12 +701,13 @@ PacketBufferHandle encodeBasicClusterWriteLocationAttribute(uint8_t seqNum, Endp
     }
 
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0006)
-        .Put8(66)
-        .Put(static_cast<uint8_t>(locationStrLen))
-        .Put(location.data(), locationStrLen);
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0006)
+       .Put8(66)
+       .Put(static_cast<uint8_t>(locationStrLen))
+       .Put(location.data(), locationStrLen)
+       ;
     COMMAND_FOOTER();
 }
 
@@ -628,7 +717,10 @@ PacketBufferHandle encodeBasicClusterWriteLocationAttribute(uint8_t seqNum, Endp
 PacketBufferHandle encodeBasicClusterReadHardwareVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicHardwareVersion", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0007);
     COMMAND_FOOTER();
 }
 
@@ -638,7 +730,10 @@ PacketBufferHandle encodeBasicClusterReadHardwareVersionAttribute(uint8_t seqNum
 PacketBufferHandle encodeBasicClusterReadHardwareVersionStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicHardwareVersionString", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0008);
     COMMAND_FOOTER();
 }
 
@@ -648,7 +743,10 @@ PacketBufferHandle encodeBasicClusterReadHardwareVersionStringAttribute(uint8_t
 PacketBufferHandle encodeBasicClusterReadSoftwareVersionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicSoftwareVersion", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0009);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0009);
     COMMAND_FOOTER();
 }
 
@@ -658,7 +756,10 @@ PacketBufferHandle encodeBasicClusterReadSoftwareVersionAttribute(uint8_t seqNum
 PacketBufferHandle encodeBasicClusterReadSoftwareVersionStringAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicSoftwareVersionString", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000A);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x000A);
     COMMAND_FOOTER();
 }
 
@@ -668,7 +769,10 @@ PacketBufferHandle encodeBasicClusterReadSoftwareVersionStringAttribute(uint8_t
 PacketBufferHandle encodeBasicClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBasicClusterRevision", BASIC_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -686,43 +790,55 @@ PacketBufferHandle encodeBasicClusterReadClusterRevisionAttribute(uint8_t seqNum
 /*
  * Command Bind
  */
-PacketBufferHandle encodeBindingClusterBindCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::NodeId nodeId,
-                                                   chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
+PacketBufferHandle encodeBindingClusterBindCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
 {
     COMMAND_HEADER("Bind", BINDING_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_BIND_COMMAND_ID)
-        .Put64(nodeId)
-        .Put16(groupId)
-        .Put8(endpointId)
-        .Put16(clusterId);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_BIND_COMMAND_ID)
+       .Put64(nodeId)
+           .Put16(groupId)
+           .Put8(endpointId)
+           .Put16(clusterId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command Unbind
  */
-PacketBufferHandle encodeBindingClusterUnbindCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::NodeId nodeId,
-                                                     chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
+PacketBufferHandle encodeBindingClusterUnbindCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
 {
     COMMAND_HEADER("Unbind", BINDING_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_UNBIND_COMMAND_ID)
-        .Put64(nodeId)
-        .Put16(groupId)
-        .Put8(endpointId)
-        .Put16(clusterId);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_UNBIND_COMMAND_ID)
+       .Put64(nodeId)
+           .Put16(groupId)
+           .Put8(endpointId)
+           .Put16(clusterId)
+        ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeBindingClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverBindingAttributes", BINDING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -732,7 +848,10 @@ PacketBufferHandle encodeBindingClusterDiscoverAttributes(uint8_t seqNum, Endpoi
 PacketBufferHandle encodeBindingClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadBindingClusterRevision", BINDING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -812,282 +931,337 @@ PacketBufferHandle encodeBindingClusterReadClusterRevisionAttribute(uint8_t seqN
 /*
  * Command MoveColor
  */
-PacketBufferHandle encodeColorControlClusterMoveColorCommand(uint8_t seqNum, EndpointId destinationEndpoint, int16_t rateX,
-                                                             int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveColorCommand(uint8_t seqNum, EndpointId destinationEndpoint, int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveColor", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_COLOR_COMMAND_ID)
-        .Put16(static_cast<uint16_t>(rateX))
-        .Put16(static_cast<uint16_t>(rateY))
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_COLOR_COMMAND_ID)
+       .Put16(static_cast<uint16_t>(rateX))
+       .Put16(static_cast<uint16_t>(rateY))
+       .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveColorTemperature
  */
-PacketBufferHandle encodeColorControlClusterMoveColorTemperatureCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                        uint8_t moveMode, uint16_t rate,
-                                                                        uint16_t colorTemperatureMinimum,
-                                                                        uint16_t colorTemperatureMaximum, uint8_t optionsMask,
-                                                                        uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveColorTemperatureCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveColorTemperature", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID)
-        .Put8(moveMode)
-        .Put16(rate)
-        .Put16(colorTemperatureMinimum)
-        .Put16(colorTemperatureMaximum)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID)
+       .Put8(moveMode)
+           .Put16(rate)
+           .Put16(colorTemperatureMinimum)
+           .Put16(colorTemperatureMaximum)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveHue
  */
-PacketBufferHandle encodeColorControlClusterMoveHueCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode,
-                                                           uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveHueCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveHue", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_HUE_COMMAND_ID)
-        .Put8(moveMode)
-        .Put8(rate)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_HUE_COMMAND_ID)
+       .Put8(moveMode)
+           .Put8(rate)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveSaturation
  */
-PacketBufferHandle encodeColorControlClusterMoveSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode,
-                                                                  uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveSaturation", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_SATURATION_COMMAND_ID)
-        .Put8(moveMode)
-        .Put8(rate)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_SATURATION_COMMAND_ID)
+       .Put8(moveMode)
+           .Put8(rate)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveToColor
  */
-PacketBufferHandle encodeColorControlClusterMoveToColorCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorX,
-                                                               uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask,
-                                                               uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveToColorCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveToColor", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_TO_COLOR_COMMAND_ID)
-        .Put16(colorX)
-        .Put16(colorY)
-        .Put16(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_TO_COLOR_COMMAND_ID)
+       .Put16(colorX)
+           .Put16(colorY)
+           .Put16(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveToColorTemperature
  */
-PacketBufferHandle encodeColorControlClusterMoveToColorTemperatureCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                          uint16_t colorTemperature, uint16_t transitionTime,
-                                                                          uint8_t optionsMask, uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveToColorTemperatureCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveToColorTemperature", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID)
-        .Put16(colorTemperature)
-        .Put16(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID)
+       .Put16(colorTemperature)
+           .Put16(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveToHue
  */
-PacketBufferHandle encodeColorControlClusterMoveToHueCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t hue,
-                                                             uint8_t direction, uint16_t transitionTime, uint8_t optionsMask,
-                                                             uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveToHueCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveToHue", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_TO_HUE_COMMAND_ID)
-        .Put8(hue)
-        .Put8(direction)
-        .Put16(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_TO_HUE_COMMAND_ID)
+       .Put8(hue)
+           .Put8(direction)
+           .Put16(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveToHueAndSaturation
  */
-PacketBufferHandle encodeColorControlClusterMoveToHueAndSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                          uint8_t hue, uint8_t saturation, uint16_t transitionTime,
-                                                                          uint8_t optionsMask, uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveToHueAndSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveToHueAndSaturation", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID)
-        .Put8(hue)
-        .Put8(saturation)
-        .Put16(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID)
+       .Put8(hue)
+           .Put8(saturation)
+           .Put16(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveToSaturation
  */
-PacketBufferHandle encodeColorControlClusterMoveToSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                    uint8_t saturation, uint16_t transitionTime,
-                                                                    uint8_t optionsMask, uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterMoveToSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("MoveToSaturation", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_TO_SATURATION_COMMAND_ID)
-        .Put8(saturation)
-        .Put16(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_TO_SATURATION_COMMAND_ID)
+       .Put8(saturation)
+           .Put16(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command StepColor
  */
-PacketBufferHandle encodeColorControlClusterStepColorCommand(uint8_t seqNum, EndpointId destinationEndpoint, int16_t stepX,
-                                                             int16_t stepY, uint16_t transitionTime, uint8_t optionsMask,
-                                                             uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterStepColorCommand(uint8_t seqNum, EndpointId destinationEndpoint, int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("StepColor", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_STEP_COLOR_COMMAND_ID)
-        .Put16(static_cast<uint16_t>(stepX))
-        .Put16(static_cast<uint16_t>(stepY))
-        .Put16(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STEP_COLOR_COMMAND_ID)
+       .Put16(static_cast<uint16_t>(stepX))
+       .Put16(static_cast<uint16_t>(stepY))
+       .Put16(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command StepColorTemperature
  */
-PacketBufferHandle encodeColorControlClusterStepColorTemperatureCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                        uint8_t stepMode, uint16_t stepSize,
-                                                                        uint16_t transitionTime, uint16_t colorTemperatureMinimum,
-                                                                        uint16_t colorTemperatureMaximum, uint8_t optionsMask,
-                                                                        uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterStepColorTemperatureCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("StepColorTemperature", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID)
-        .Put8(stepMode)
-        .Put16(stepSize)
-        .Put16(transitionTime)
-        .Put16(colorTemperatureMinimum)
-        .Put16(colorTemperatureMaximum)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID)
+       .Put8(stepMode)
+           .Put16(stepSize)
+           .Put16(transitionTime)
+           .Put16(colorTemperatureMinimum)
+           .Put16(colorTemperatureMaximum)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command StepHue
  */
-PacketBufferHandle encodeColorControlClusterStepHueCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode,
-                                                           uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask,
-                                                           uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterStepHueCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("StepHue", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_STEP_HUE_COMMAND_ID)
-        .Put8(stepMode)
-        .Put8(stepSize)
-        .Put8(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STEP_HUE_COMMAND_ID)
+       .Put8(stepMode)
+           .Put8(stepSize)
+           .Put8(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command StepSaturation
  */
-PacketBufferHandle encodeColorControlClusterStepSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode,
-                                                                  uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask,
-                                                                  uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterStepSaturationCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("StepSaturation", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_STEP_SATURATION_COMMAND_ID)
-        .Put8(stepMode)
-        .Put8(stepSize)
-        .Put8(transitionTime)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STEP_SATURATION_COMMAND_ID)
+       .Put8(stepMode)
+           .Put8(stepSize)
+           .Put8(transitionTime)
+           .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command StopMoveStep
  */
-PacketBufferHandle encodeColorControlClusterStopMoveStepCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t optionsMask,
-                                                                uint8_t optionsOverride)
+PacketBufferHandle encodeColorControlClusterStopMoveStepCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t optionsMask, uint8_t optionsOverride)
 {
     COMMAND_HEADER("StopMoveStep", COLOR_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_STOP_MOVE_STEP_COMMAND_ID)
-        .Put8(optionsMask)
-        .Put8(optionsOverride);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STOP_MOVE_STEP_COMMAND_ID)
+       .Put8(optionsMask)
+           .Put8(optionsOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeColorControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverColorControlAttributes", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -1097,22 +1271,24 @@ PacketBufferHandle encodeColorControlClusterDiscoverAttributes(uint8_t seqNum, E
 PacketBufferHandle encodeColorControlClusterReadCurrentHueAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlCurrentHue", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterConfigureCurrentHueAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                         uint16_t minInterval, uint16_t maxInterval, uint8_t change)
+PacketBufferHandle encodeColorControlClusterConfigureCurrentHueAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint8_t change)
 {
     COMMAND_HEADER("ReportColorControlCurrentHue", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0000)
-        .Put8(32)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0000)
+       .Put8(32)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     buf.Put8(static_cast<uint8_t>(change));
     COMMAND_FOOTER();
 }
@@ -1123,23 +1299,24 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentHueAttribute(uint8_t
 PacketBufferHandle encodeColorControlClusterReadCurrentSaturationAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlCurrentSaturation", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterConfigureCurrentSaturationAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                                uint16_t minInterval, uint16_t maxInterval,
-                                                                                uint8_t change)
+PacketBufferHandle encodeColorControlClusterConfigureCurrentSaturationAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint8_t change)
 {
     COMMAND_HEADER("ReportColorControlCurrentSaturation", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0001)
-        .Put8(32)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0001)
+       .Put8(32)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     buf.Put8(static_cast<uint8_t>(change));
     COMMAND_FOOTER();
 }
@@ -1150,7 +1327,10 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentSaturationAttribute(
 PacketBufferHandle encodeColorControlClusterReadRemainingTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlRemainingTime", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -1160,22 +1340,24 @@ PacketBufferHandle encodeColorControlClusterReadRemainingTimeAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadCurrentXAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlCurrentX", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0003);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterConfigureCurrentXAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t minInterval, uint16_t maxInterval, uint16_t change)
+PacketBufferHandle encodeColorControlClusterConfigureCurrentXAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint16_t change)
 {
     COMMAND_HEADER("ReportColorControlCurrentX", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0003)
-        .Put8(33)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0003)
+       .Put8(33)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     buf.Put16(static_cast<uint16_t>(change));
     COMMAND_FOOTER();
 }
@@ -1186,22 +1368,24 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentXAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadCurrentYAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlCurrentY", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0004);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterConfigureCurrentYAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t minInterval, uint16_t maxInterval, uint16_t change)
+PacketBufferHandle encodeColorControlClusterConfigureCurrentYAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint16_t change)
 {
     COMMAND_HEADER("ReportColorControlCurrentY", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0004)
-        .Put8(33)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0004)
+       .Put8(33)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     buf.Put16(static_cast<uint16_t>(change));
     COMMAND_FOOTER();
 }
@@ -1212,7 +1396,10 @@ PacketBufferHandle encodeColorControlClusterConfigureCurrentYAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadDriftCompensationAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlDriftCompensation", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0005);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0005);
     COMMAND_FOOTER();
 }
 
@@ -1222,7 +1409,10 @@ PacketBufferHandle encodeColorControlClusterReadDriftCompensationAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadCompensationTextAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlCompensationText", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0006);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0006);
     COMMAND_FOOTER();
 }
 
@@ -1232,23 +1422,24 @@ PacketBufferHandle encodeColorControlClusterReadCompensationTextAttribute(uint8_
 PacketBufferHandle encodeColorControlClusterReadColorTemperatureAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorTemperature", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0007);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0007);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterConfigureColorTemperatureAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                               uint16_t minInterval, uint16_t maxInterval,
-                                                                               uint16_t change)
+PacketBufferHandle encodeColorControlClusterConfigureColorTemperatureAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint16_t change)
 {
     COMMAND_HEADER("ReportColorControlColorTemperature", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0007)
-        .Put8(33)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0007)
+       .Put8(33)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     buf.Put16(static_cast<uint16_t>(change));
     COMMAND_FOOTER();
 }
@@ -1259,7 +1450,10 @@ PacketBufferHandle encodeColorControlClusterConfigureColorTemperatureAttribute(u
 PacketBufferHandle encodeColorControlClusterReadColorModeAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorMode", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0008);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0008);
     COMMAND_FOOTER();
 }
 
@@ -1269,20 +1463,23 @@ PacketBufferHandle encodeColorControlClusterReadColorModeAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadColorControlOptionsAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorControlOptions", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x000F);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x000F);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorControlOptionsAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                              uint8_t colorControlOptions)
+PacketBufferHandle encodeColorControlClusterWriteColorControlOptionsAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t colorControlOptions)
 {
     COMMAND_HEADER("WriteColorControlColorControlOptions", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x000F)
-        .Put8(24)
-        .Put8(static_cast<uint8_t>(colorControlOptions));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x000F)
+       .Put8(24)
+       .Put8(static_cast<uint8_t>(colorControlOptions))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1292,7 +1489,10 @@ PacketBufferHandle encodeColorControlClusterWriteColorControlOptionsAttribute(ui
 PacketBufferHandle encodeColorControlClusterReadNumberOfPrimariesAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlNumberOfPrimaries", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0010);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0010);
     COMMAND_FOOTER();
 }
 
@@ -1302,7 +1502,10 @@ PacketBufferHandle encodeColorControlClusterReadNumberOfPrimariesAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadPrimary1XAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary1X", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0011);
     COMMAND_FOOTER();
 }
 
@@ -1312,7 +1515,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary1XAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary1YAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary1Y", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0012);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0012);
     COMMAND_FOOTER();
 }
 
@@ -1322,7 +1528,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary1YAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary1IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary1Intensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0013);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0013);
     COMMAND_FOOTER();
 }
 
@@ -1332,7 +1541,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary1IntensityAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadPrimary2XAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary2X", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0015);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0015);
     COMMAND_FOOTER();
 }
 
@@ -1342,7 +1554,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary2XAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary2YAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary2Y", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0016);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0016);
     COMMAND_FOOTER();
 }
 
@@ -1352,7 +1567,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary2YAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary2IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary2Intensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0017);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0017);
     COMMAND_FOOTER();
 }
 
@@ -1362,7 +1580,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary2IntensityAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadPrimary3XAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary3X", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0019);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0019);
     COMMAND_FOOTER();
 }
 
@@ -1372,7 +1593,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary3XAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary3YAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary3Y", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001A);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x001A);
     COMMAND_FOOTER();
 }
 
@@ -1382,7 +1606,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary3YAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary3IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary3Intensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x001B);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x001B);
     COMMAND_FOOTER();
 }
 
@@ -1392,7 +1619,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary3IntensityAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadPrimary4XAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary4X", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0020);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0020);
     COMMAND_FOOTER();
 }
 
@@ -1402,7 +1632,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary4XAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary4YAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary4Y", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0021);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0021);
     COMMAND_FOOTER();
 }
 
@@ -1412,7 +1645,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary4YAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary4IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary4Intensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0022);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0022);
     COMMAND_FOOTER();
 }
 
@@ -1422,7 +1658,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary4IntensityAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadPrimary5XAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary5X", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0024);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0024);
     COMMAND_FOOTER();
 }
 
@@ -1432,7 +1671,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary5XAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary5YAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary5Y", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0025);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0025);
     COMMAND_FOOTER();
 }
 
@@ -1442,7 +1684,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary5YAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary5IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary5Intensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0026);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0026);
     COMMAND_FOOTER();
 }
 
@@ -1452,7 +1697,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary5IntensityAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadPrimary6XAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary6X", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0028);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0028);
     COMMAND_FOOTER();
 }
 
@@ -1462,7 +1710,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary6XAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary6YAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary6Y", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0029);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0029);
     COMMAND_FOOTER();
 }
 
@@ -1472,7 +1723,10 @@ PacketBufferHandle encodeColorControlClusterReadPrimary6YAttribute(uint8_t seqNu
 PacketBufferHandle encodeColorControlClusterReadPrimary6IntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlPrimary6Intensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x002A);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x002A);
     COMMAND_FOOTER();
 }
 
@@ -1482,20 +1736,23 @@ PacketBufferHandle encodeColorControlClusterReadPrimary6IntensityAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadWhitePointXAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlWhitePointX", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0030);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0030);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteWhitePointXAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                      uint16_t whitePointX)
+PacketBufferHandle encodeColorControlClusterWriteWhitePointXAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t whitePointX)
 {
     COMMAND_HEADER("WriteColorControlWhitePointX", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0030)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(whitePointX));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0030)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(whitePointX))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1505,20 +1762,23 @@ PacketBufferHandle encodeColorControlClusterWriteWhitePointXAttribute(uint8_t se
 PacketBufferHandle encodeColorControlClusterReadWhitePointYAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlWhitePointY", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0031);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0031);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteWhitePointYAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                      uint16_t whitePointY)
+PacketBufferHandle encodeColorControlClusterWriteWhitePointYAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t whitePointY)
 {
     COMMAND_HEADER("WriteColorControlWhitePointY", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0031)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(whitePointY));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0031)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(whitePointY))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1528,20 +1788,23 @@ PacketBufferHandle encodeColorControlClusterWriteWhitePointYAttribute(uint8_t se
 PacketBufferHandle encodeColorControlClusterReadColorPointRXAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointRX", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0032);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0032);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointRXAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t colorPointRX)
+PacketBufferHandle encodeColorControlClusterWriteColorPointRXAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorPointRX)
 {
     COMMAND_HEADER("WriteColorControlColorPointRX", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0032)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(colorPointRX));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0032)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(colorPointRX))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1551,20 +1814,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRXAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadColorPointRYAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointRY", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0033);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0033);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointRYAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t colorPointRY)
+PacketBufferHandle encodeColorControlClusterWriteColorPointRYAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorPointRY)
 {
     COMMAND_HEADER("WriteColorControlColorPointRY", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0033)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(colorPointRY));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0033)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(colorPointRY))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1574,20 +1840,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRYAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadColorPointRIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointRIntensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0034);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0034);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointRIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                               uint8_t colorPointRIntensity)
+PacketBufferHandle encodeColorControlClusterWriteColorPointRIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t colorPointRIntensity)
 {
     COMMAND_HEADER("WriteColorControlColorPointRIntensity", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0034)
-        .Put8(32)
-        .Put8(static_cast<uint8_t>(colorPointRIntensity));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0034)
+       .Put8(32)
+       .Put8(static_cast<uint8_t>(colorPointRIntensity))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1597,20 +1866,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointRIntensityAttribute(u
 PacketBufferHandle encodeColorControlClusterReadColorPointGXAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointGX", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0036);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0036);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointGXAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t colorPointGX)
+PacketBufferHandle encodeColorControlClusterWriteColorPointGXAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorPointGX)
 {
     COMMAND_HEADER("WriteColorControlColorPointGX", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0036)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(colorPointGX));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0036)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(colorPointGX))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1620,20 +1892,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGXAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadColorPointGYAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointGY", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0037);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0037);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointGYAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t colorPointGY)
+PacketBufferHandle encodeColorControlClusterWriteColorPointGYAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorPointGY)
 {
     COMMAND_HEADER("WriteColorControlColorPointGY", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0037)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(colorPointGY));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0037)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(colorPointGY))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1643,20 +1918,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGYAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadColorPointGIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointGIntensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0038);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0038);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointGIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                               uint8_t colorPointGIntensity)
+PacketBufferHandle encodeColorControlClusterWriteColorPointGIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t colorPointGIntensity)
 {
     COMMAND_HEADER("WriteColorControlColorPointGIntensity", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0038)
-        .Put8(32)
-        .Put8(static_cast<uint8_t>(colorPointGIntensity));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0038)
+       .Put8(32)
+       .Put8(static_cast<uint8_t>(colorPointGIntensity))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1666,20 +1944,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointGIntensityAttribute(u
 PacketBufferHandle encodeColorControlClusterReadColorPointBXAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointBX", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003A);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x003A);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointBXAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t colorPointBX)
+PacketBufferHandle encodeColorControlClusterWriteColorPointBXAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorPointBX)
 {
     COMMAND_HEADER("WriteColorControlColorPointBX", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x003A)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(colorPointBX));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x003A)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(colorPointBX))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1689,20 +1970,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBXAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadColorPointBYAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointBY", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003B);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x003B);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointBYAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t colorPointBY)
+PacketBufferHandle encodeColorControlClusterWriteColorPointBYAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t colorPointBY)
 {
     COMMAND_HEADER("WriteColorControlColorPointBY", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x003B)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(colorPointBY));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x003B)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(colorPointBY))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1712,20 +1996,23 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBYAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadColorPointBIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorPointBIntensity", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x003C);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x003C);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteColorPointBIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                               uint8_t colorPointBIntensity)
+PacketBufferHandle encodeColorControlClusterWriteColorPointBIntensityAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t colorPointBIntensity)
 {
     COMMAND_HEADER("WriteColorControlColorPointBIntensity", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x003C)
-        .Put8(32)
-        .Put8(static_cast<uint8_t>(colorPointBIntensity));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x003C)
+       .Put8(32)
+       .Put8(static_cast<uint8_t>(colorPointBIntensity))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1735,7 +2022,10 @@ PacketBufferHandle encodeColorControlClusterWriteColorPointBIntensityAttribute(u
 PacketBufferHandle encodeColorControlClusterReadEnhancedCurrentHueAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlEnhancedCurrentHue", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x4000);
     COMMAND_FOOTER();
 }
 
@@ -1745,7 +2035,10 @@ PacketBufferHandle encodeColorControlClusterReadEnhancedCurrentHueAttribute(uint
 PacketBufferHandle encodeColorControlClusterReadEnhancedColorModeAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlEnhancedColorMode", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x4001);
     COMMAND_FOOTER();
 }
 
@@ -1755,7 +2048,10 @@ PacketBufferHandle encodeColorControlClusterReadEnhancedColorModeAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadColorLoopActiveAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorLoopActive", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x4002);
     COMMAND_FOOTER();
 }
 
@@ -1765,7 +2061,10 @@ PacketBufferHandle encodeColorControlClusterReadColorLoopActiveAttribute(uint8_t
 PacketBufferHandle encodeColorControlClusterReadColorLoopDirectionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorLoopDirection", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4003);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x4003);
     COMMAND_FOOTER();
 }
 
@@ -1775,7 +2074,10 @@ PacketBufferHandle encodeColorControlClusterReadColorLoopDirectionAttribute(uint
 PacketBufferHandle encodeColorControlClusterReadColorLoopTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorLoopTime", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4004);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x4004);
     COMMAND_FOOTER();
 }
 
@@ -1785,7 +2087,10 @@ PacketBufferHandle encodeColorControlClusterReadColorLoopTimeAttribute(uint8_t s
 PacketBufferHandle encodeColorControlClusterReadColorCapabilitiesAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorCapabilities", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400A);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x400A);
     COMMAND_FOOTER();
 }
 
@@ -1795,7 +2100,10 @@ PacketBufferHandle encodeColorControlClusterReadColorCapabilitiesAttribute(uint8
 PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMinAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorTempPhysicalMin", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400B);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x400B);
     COMMAND_FOOTER();
 }
 
@@ -1805,43 +2113,49 @@ PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMinAttribute(ui
 PacketBufferHandle encodeColorControlClusterReadColorTempPhysicalMaxAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlColorTempPhysicalMax", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400C);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x400C);
     COMMAND_FOOTER();
 }
 
 /*
  * Attribute CoupleColorTempToLevelMinMireds
  */
-PacketBufferHandle encodeColorControlClusterReadCoupleColorTempToLevelMinMiredsAttribute(uint8_t seqNum,
-                                                                                         EndpointId destinationEndpoint)
+PacketBufferHandle encodeColorControlClusterReadCoupleColorTempToLevelMinMiredsAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlCoupleColorTempToLevelMinMireds", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x400D);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x400D);
     COMMAND_FOOTER();
 }
 
 /*
  * Attribute StartUpColorTemperatureMireds
  */
-PacketBufferHandle encodeColorControlClusterReadStartUpColorTemperatureMiredsAttribute(uint8_t seqNum,
-                                                                                       EndpointId destinationEndpoint)
+PacketBufferHandle encodeColorControlClusterReadStartUpColorTemperatureMiredsAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlStartUpColorTemperatureMireds", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x4010);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x4010);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeColorControlClusterWriteStartUpColorTemperatureMiredsAttribute(uint8_t seqNum,
-                                                                                        EndpointId destinationEndpoint,
-                                                                                        uint16_t startUpColorTemperatureMireds)
+PacketBufferHandle encodeColorControlClusterWriteStartUpColorTemperatureMiredsAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t startUpColorTemperatureMireds)
 {
     COMMAND_HEADER("WriteColorControlStartUpColorTemperatureMireds", COLOR_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x4010)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(startUpColorTemperatureMireds));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x4010)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(startUpColorTemperatureMireds))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -1851,7 +2165,10 @@ PacketBufferHandle encodeColorControlClusterWriteStartUpColorTemperatureMiredsAt
 PacketBufferHandle encodeColorControlClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadColorControlClusterRevision", COLOR_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -1896,7 +2213,11 @@ PacketBufferHandle encodeColorControlClusterReadClusterRevisionAttribute(uint8_t
 PacketBufferHandle encodeDoorLockClusterClearAllPinsCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ClearAllPins", DOOR_LOCK_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_CLEAR_ALL_PINS_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_CLEAR_ALL_PINS_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
@@ -1906,19 +2227,27 @@ PacketBufferHandle encodeDoorLockClusterClearAllPinsCommand(uint8_t seqNum, Endp
 PacketBufferHandle encodeDoorLockClusterClearAllRfidsCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ClearAllRfids", DOOR_LOCK_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_CLEAR_ALL_RFIDS_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_CLEAR_ALL_RFIDS_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command ClearHolidaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterClearHolidayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                    uint8_t scheduleId)
+PacketBufferHandle encodeDoorLockClusterClearHolidayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId)
 {
     COMMAND_HEADER("ClearHolidaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID).Put8(scheduleId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -1929,7 +2258,12 @@ PacketBufferHandle encodeDoorLockClusterClearPinCommand(uint8_t seqNum, Endpoint
 {
     COMMAND_HEADER("ClearPin", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_CLEAR_PIN_COMMAND_ID).Put16(userId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_CLEAR_PIN_COMMAND_ID)
+       .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -1940,51 +2274,64 @@ PacketBufferHandle encodeDoorLockClusterClearRfidCommand(uint8_t seqNum, Endpoin
 {
     COMMAND_HEADER("ClearRfid", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_CLEAR_RFID_COMMAND_ID).Put16(userId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_CLEAR_RFID_COMMAND_ID)
+       .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command ClearWeekdaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterClearWeekdayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                    uint8_t scheduleId, uint16_t userId)
+PacketBufferHandle encodeDoorLockClusterClearWeekdayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId)
 {
     COMMAND_HEADER("ClearWeekdaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID)
-        .Put8(scheduleId)
-        .Put16(userId);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+           .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command ClearYeardaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterClearYeardayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                    uint8_t scheduleId, uint16_t userId)
+PacketBufferHandle encodeDoorLockClusterClearYeardayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId)
 {
     COMMAND_HEADER("ClearYeardaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID)
-        .Put8(scheduleId)
-        .Put16(userId);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+           .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command GetHolidaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterGetHolidayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                  uint8_t scheduleId)
+PacketBufferHandle encodeDoorLockClusterGetHolidayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId)
 {
     COMMAND_HEADER("GetHolidaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID).Put8(scheduleId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -1995,7 +2342,12 @@ PacketBufferHandle encodeDoorLockClusterGetLogRecordCommand(uint8_t seqNum, Endp
 {
     COMMAND_HEADER("GetLogRecord", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_GET_LOG_RECORD_COMMAND_ID).Put16(logIndex);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_LOG_RECORD_COMMAND_ID)
+       .Put16(logIndex)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2006,7 +2358,12 @@ PacketBufferHandle encodeDoorLockClusterGetPinCommand(uint8_t seqNum, EndpointId
 {
     COMMAND_HEADER("GetPin", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_GET_PIN_COMMAND_ID).Put16(userId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_PIN_COMMAND_ID)
+       .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2017,7 +2374,12 @@ PacketBufferHandle encodeDoorLockClusterGetRfidCommand(uint8_t seqNum, EndpointI
 {
     COMMAND_HEADER("GetRfid", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_GET_RFID_COMMAND_ID).Put16(userId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_RFID_COMMAND_ID)
+       .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2028,39 +2390,48 @@ PacketBufferHandle encodeDoorLockClusterGetUserTypeCommand(uint8_t seqNum, Endpo
 {
     COMMAND_HEADER("GetUserType", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_GET_USER_TYPE_COMMAND_ID).Put16(userId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_USER_TYPE_COMMAND_ID)
+       .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command GetWeekdaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterGetWeekdayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                  uint8_t scheduleId, uint16_t userId)
+PacketBufferHandle encodeDoorLockClusterGetWeekdayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId)
 {
     COMMAND_HEADER("GetWeekdaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID)
-        .Put8(scheduleId)
-        .Put16(userId);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+           .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command GetYeardaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterGetYeardayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                  uint8_t scheduleId, uint16_t userId)
+PacketBufferHandle encodeDoorLockClusterGetYeardayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId)
 {
     COMMAND_HEADER("GetYeardaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID)
-        .Put8(scheduleId)
-        .Put16(userId);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+           .Put16(userId)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2077,41 +2448,47 @@ PacketBufferHandle encodeDoorLockClusterLockDoorCommand(uint8_t seqNum, Endpoint
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_LOCK_DOOR_COMMAND_ID)
-        .Put(static_cast<uint8_t>(pinStrLen))
-        .Put(pin.data(), pin.size());
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_LOCK_DOOR_COMMAND_ID)
+       .Put(static_cast<uint8_t>(pinStrLen))
+       .Put(pin.data(), pin.size())
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command SetHolidaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterSetHolidayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                  uint8_t scheduleId, uint32_t localStartTime,
-                                                                  uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+PacketBufferHandle encodeDoorLockClusterSetHolidayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
 {
     COMMAND_HEADER("SetHolidaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID)
-        .Put8(scheduleId)
-        .Put32(localStartTime)
-        .Put32(localEndTime)
-        .Put8(operatingModeDuringHoliday);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+           .Put32(localStartTime)
+           .Put32(localEndTime)
+           .Put8(operatingModeDuringHoliday)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command SetPin
  */
-PacketBufferHandle encodeDoorLockClusterSetPinCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t userId,
-                                                      uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
+PacketBufferHandle encodeDoorLockClusterSetPinCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
 {
     COMMAND_HEADER("SetPin", DOOR_LOCK_CLUSTER_ID);
 
+
+
     size_t pinStrLen = pin.size();
     if (!CanCastTo<uint8_t>(pinStrLen))
     {
@@ -2119,25 +2496,28 @@ PacketBufferHandle encodeDoorLockClusterSetPinCommand(uint8_t seqNum, EndpointId
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_SET_PIN_COMMAND_ID)
-        .Put16(userId)
-        .Put8(userStatus)
-        .Put8(userType)
-        .Put(static_cast<uint8_t>(pinStrLen))
-        .Put(pin.data(), pin.size());
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SET_PIN_COMMAND_ID)
+       .Put16(userId)
+           .Put8(userStatus)
+           .Put8(userType)
+           .Put(static_cast<uint8_t>(pinStrLen))
+       .Put(pin.data(), pin.size())
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command SetRfid
  */
-PacketBufferHandle encodeDoorLockClusterSetRfidCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t userId,
-                                                       uint8_t userStatus, uint8_t userType, chip::ByteSpan id)
+PacketBufferHandle encodeDoorLockClusterSetRfidCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan id)
 {
     COMMAND_HEADER("SetRfid", DOOR_LOCK_CLUSTER_ID);
 
+
+
     size_t idStrLen = id.size();
     if (!CanCastTo<uint8_t>(idStrLen))
     {
@@ -2145,68 +2525,84 @@ PacketBufferHandle encodeDoorLockClusterSetRfidCommand(uint8_t seqNum, EndpointI
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_SET_RFID_COMMAND_ID)
-        .Put16(userId)
-        .Put8(userStatus)
-        .Put8(userType)
-        .Put(static_cast<uint8_t>(idStrLen))
-        .Put(id.data(), id.size());
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SET_RFID_COMMAND_ID)
+       .Put16(userId)
+           .Put8(userStatus)
+           .Put8(userType)
+           .Put(static_cast<uint8_t>(idStrLen))
+       .Put(id.data(), id.size())
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command SetUserType
  */
-PacketBufferHandle encodeDoorLockClusterSetUserTypeCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t userId,
-                                                           uint8_t userType)
+PacketBufferHandle encodeDoorLockClusterSetUserTypeCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t userId, uint8_t userType)
 {
     COMMAND_HEADER("SetUserType", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_SET_USER_TYPE_COMMAND_ID).Put16(userId).Put8(userType);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SET_USER_TYPE_COMMAND_ID)
+       .Put16(userId)
+           .Put8(userType)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command SetWeekdaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterSetWeekdayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                  uint8_t scheduleId, uint16_t userId, uint8_t daysMask,
-                                                                  uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-                                                                  uint8_t endMinute)
+PacketBufferHandle encodeDoorLockClusterSetWeekdayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     COMMAND_HEADER("SetWeekdaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID)
-        .Put8(scheduleId)
-        .Put16(userId)
-        .Put8(daysMask)
-        .Put8(startHour)
-        .Put8(startMinute)
-        .Put8(endHour)
-        .Put8(endMinute);
+
+
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+           .Put16(userId)
+           .Put8(daysMask)
+           .Put8(startHour)
+           .Put8(startMinute)
+           .Put8(endHour)
+           .Put8(endMinute)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command SetYeardaySchedule
  */
-PacketBufferHandle encodeDoorLockClusterSetYeardayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                  uint8_t scheduleId, uint16_t userId, uint32_t localStartTime,
-                                                                  uint32_t localEndTime)
+PacketBufferHandle encodeDoorLockClusterSetYeardayScheduleCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime)
 {
     COMMAND_HEADER("SetYeardaySchedule", DOOR_LOCK_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID)
-        .Put8(scheduleId)
-        .Put16(userId)
-        .Put32(localStartTime)
-        .Put32(localEndTime);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID)
+       .Put8(scheduleId)
+           .Put16(userId)
+           .Put32(localStartTime)
+           .Put32(localEndTime)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2223,19 +2619,20 @@ PacketBufferHandle encodeDoorLockClusterUnlockDoorCommand(uint8_t seqNum, Endpoi
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_UNLOCK_DOOR_COMMAND_ID)
-        .Put(static_cast<uint8_t>(pinStrLen))
-        .Put(pin.data(), pin.size());
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_UNLOCK_DOOR_COMMAND_ID)
+       .Put(static_cast<uint8_t>(pinStrLen))
+       .Put(pin.data(), pin.size())
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command UnlockWithTimeout
  */
-PacketBufferHandle encodeDoorLockClusterUnlockWithTimeoutCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                 uint16_t timeoutInSeconds, chip::ByteSpan pin)
+PacketBufferHandle encodeDoorLockClusterUnlockWithTimeoutCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t timeoutInSeconds, chip::ByteSpan pin)
 {
     COMMAND_HEADER("UnlockWithTimeout", DOOR_LOCK_CLUSTER_ID);
 
@@ -2246,19 +2643,25 @@ PacketBufferHandle encodeDoorLockClusterUnlockWithTimeoutCommand(uint8_t seqNum,
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID)
-        .Put16(timeoutInSeconds)
-        .Put(static_cast<uint8_t>(pinStrLen))
-        .Put(pin.data(), pin.size());
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID)
+       .Put16(timeoutInSeconds)
+           .Put(static_cast<uint8_t>(pinStrLen))
+       .Put(pin.data(), pin.size())
+    ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeDoorLockClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverDoorLockAttributes", DOOR_LOCK_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -2268,22 +2671,24 @@ PacketBufferHandle encodeDoorLockClusterDiscoverAttributes(uint8_t seqNum, Endpo
 PacketBufferHandle encodeDoorLockClusterReadLockStateAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadDoorLockLockState", DOOR_LOCK_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeDoorLockClusterConfigureLockStateAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                    uint16_t minInterval, uint16_t maxInterval)
+PacketBufferHandle encodeDoorLockClusterConfigureLockStateAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval)
 {
     COMMAND_HEADER("ReportDoorLockLockState", DOOR_LOCK_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0000)
-        .Put8(48)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0000)
+       .Put8(48)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     COMMAND_FOOTER();
 }
 
@@ -2293,7 +2698,10 @@ PacketBufferHandle encodeDoorLockClusterConfigureLockStateAttribute(uint8_t seqN
 PacketBufferHandle encodeDoorLockClusterReadLockTypeAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadDoorLockLockType", DOOR_LOCK_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -2303,7 +2711,10 @@ PacketBufferHandle encodeDoorLockClusterReadLockTypeAttribute(uint8_t seqNum, En
 PacketBufferHandle encodeDoorLockClusterReadActuatorEnabledAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadDoorLockActuatorEnabled", DOOR_LOCK_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -2313,7 +2724,10 @@ PacketBufferHandle encodeDoorLockClusterReadActuatorEnabledAttribute(uint8_t seq
 PacketBufferHandle encodeDoorLockClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadDoorLockClusterRevision", DOOR_LOCK_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -2334,18 +2748,20 @@ PacketBufferHandle encodeDoorLockClusterReadClusterRevisionAttribute(uint8_t seq
 /*
  * Command ArmFailSafe
  */
-PacketBufferHandle encodeGeneralCommissioningClusterArmFailSafeCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                       uint16_t expiryLengthSeconds, uint64_t breadcrumb,
-                                                                       uint32_t timeoutMs)
+PacketBufferHandle encodeGeneralCommissioningClusterArmFailSafeCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("ArmFailSafe", GENERAL_COMMISSIONING_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_ARM_FAIL_SAFE_COMMAND_ID)
-        .Put16(expiryLengthSeconds)
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ARM_FAIL_SAFE_COMMAND_ID)
+       .Put16(expiryLengthSeconds)
+           .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2355,16 +2771,18 @@ PacketBufferHandle encodeGeneralCommissioningClusterArmFailSafeCommand(uint8_t s
 PacketBufferHandle encodeGeneralCommissioningClusterCommissioningCompleteCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("CommissioningComplete", GENERAL_COMMISSIONING_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_COMMISSIONING_COMPLETE_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_COMMISSIONING_COMPLETE_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command SetFabric
  */
-PacketBufferHandle encodeGeneralCommissioningClusterSetFabricCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                     chip::ByteSpan fabricId, chip::ByteSpan fabricSecret,
-                                                                     uint64_t breadcrumb, uint32_t timeoutMs)
+PacketBufferHandle encodeGeneralCommissioningClusterSetFabricCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("SetFabric", GENERAL_COMMISSIONING_CLUSTER_ID);
     size_t fabricIdStrLen = fabricId.size();
@@ -2381,22 +2799,30 @@ PacketBufferHandle encodeGeneralCommissioningClusterSetFabricCommand(uint8_t seq
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_SET_FABRIC_COMMAND_ID)
-        .Put(static_cast<uint8_t>(fabricIdStrLen))
-        .Put(fabricId.data(), fabricId.size())
-        .Put(static_cast<uint8_t>(fabricSecretStrLen))
-        .Put(fabricSecret.data(), fabricSecret.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SET_FABRIC_COMMAND_ID)
+       .Put(static_cast<uint8_t>(fabricIdStrLen))
+       .Put(fabricId.data(), fabricId.size())
+       .Put(static_cast<uint8_t>(fabricSecretStrLen))
+       .Put(fabricSecret.data(), fabricSecret.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeGeneralCommissioningClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverGeneralCommissioningAttributes", GENERAL_COMMISSIONING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -2406,7 +2832,10 @@ PacketBufferHandle encodeGeneralCommissioningClusterDiscoverAttributes(uint8_t s
 PacketBufferHandle encodeGeneralCommissioningClusterReadFabricIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGeneralCommissioningFabricId", GENERAL_COMMISSIONING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
@@ -2416,20 +2845,23 @@ PacketBufferHandle encodeGeneralCommissioningClusterReadFabricIdAttribute(uint8_
 PacketBufferHandle encodeGeneralCommissioningClusterReadBreadcrumbAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGeneralCommissioningBreadcrumb", GENERAL_COMMISSIONING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                             uint64_t breadcrumb)
+PacketBufferHandle encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint64_t breadcrumb)
 {
     COMMAND_HEADER("WriteGeneralCommissioningBreadcrumb", GENERAL_COMMISSIONING_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0001)
-        .Put8(39)
-        .Put64(static_cast<uint64_t>(breadcrumb));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001)
+       .Put8(39)
+       .Put64(static_cast<uint64_t>(breadcrumb))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -2439,7 +2871,10 @@ PacketBufferHandle encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(uin
 PacketBufferHandle encodeGeneralCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGeneralCommissioningClusterRevision", GENERAL_COMMISSIONING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -2457,7 +2892,11 @@ PacketBufferHandle encodeGeneralCommissioningClusterReadClusterRevisionAttribute
 PacketBufferHandle encodeGroupKeyManagementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverGroupKeyManagementAttributes", GROUP_KEY_MANAGEMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -2467,7 +2906,10 @@ PacketBufferHandle encodeGroupKeyManagementClusterDiscoverAttributes(uint8_t seq
 PacketBufferHandle encodeGroupKeyManagementClusterReadGroupsAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGroupKeyManagementGroups", GROUP_KEY_MANAGEMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
@@ -2477,7 +2919,10 @@ PacketBufferHandle encodeGroupKeyManagementClusterReadGroupsAttribute(uint8_t se
 PacketBufferHandle encodeGroupKeyManagementClusterReadGroupKeysAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGroupKeyManagementGroupKeys", GROUP_KEY_MANAGEMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -2487,7 +2932,10 @@ PacketBufferHandle encodeGroupKeyManagementClusterReadGroupKeysAttribute(uint8_t
 PacketBufferHandle encodeGroupKeyManagementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGroupKeyManagementClusterRevision", GROUP_KEY_MANAGEMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -2510,8 +2958,7 @@ PacketBufferHandle encodeGroupKeyManagementClusterReadClusterRevisionAttribute(u
 /*
  * Command AddGroup
  */
-PacketBufferHandle encodeGroupsClusterAddGroupCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId,
-                                                      chip::ByteSpan groupName)
+PacketBufferHandle encodeGroupsClusterAddGroupCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId, chip::ByteSpan groupName)
 {
     COMMAND_HEADER("AddGroup", GROUPS_CLUSTER_ID);
 
@@ -2522,20 +2969,21 @@ PacketBufferHandle encodeGroupsClusterAddGroupCommand(uint8_t seqNum, EndpointId
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_ADD_GROUP_COMMAND_ID)
-        .Put16(groupId)
-        .Put(static_cast<uint8_t>(groupNameStrLen))
-        .Put(groupName.data(), groupName.size());
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ADD_GROUP_COMMAND_ID)
+       .Put16(groupId)
+           .Put(static_cast<uint8_t>(groupNameStrLen))
+       .Put(groupName.data(), groupName.size())
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command AddGroupIfIdentifying
  */
-PacketBufferHandle encodeGroupsClusterAddGroupIfIdentifyingCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId,
-                                                                   chip::ByteSpan groupName)
+PacketBufferHandle encodeGroupsClusterAddGroupIfIdentifyingCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId, chip::ByteSpan groupName)
 {
     COMMAND_HEADER("AddGroupIfIdentifying", GROUPS_CLUSTER_ID);
 
@@ -2546,28 +2994,32 @@ PacketBufferHandle encodeGroupsClusterAddGroupIfIdentifyingCommand(uint8_t seqNu
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID)
-        .Put16(groupId)
-        .Put(static_cast<uint8_t>(groupNameStrLen))
-        .Put(groupName.data(), groupName.size());
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID)
+       .Put16(groupId)
+           .Put(static_cast<uint8_t>(groupNameStrLen))
+       .Put(groupName.data(), groupName.size())
+    ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command GetGroupMembership
  */
-PacketBufferHandle encodeGroupsClusterGetGroupMembershipCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t groupCount,
-                                                                uint16_t groupList)
+PacketBufferHandle encodeGroupsClusterGetGroupMembershipCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t groupCount, uint16_t groupList)
 {
     COMMAND_HEADER("GetGroupMembership", GROUPS_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID)
-        .Put8(groupCount)
-        .Put16(groupList);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID)
+       .Put8(groupCount)
+           .Put16(groupList)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2577,7 +3029,11 @@ PacketBufferHandle encodeGroupsClusterGetGroupMembershipCommand(uint8_t seqNum,
 PacketBufferHandle encodeGroupsClusterRemoveAllGroupsCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("RemoveAllGroups", GROUPS_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_REMOVE_ALL_GROUPS_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_REMOVE_ALL_GROUPS_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
@@ -2588,7 +3044,12 @@ PacketBufferHandle encodeGroupsClusterRemoveGroupCommand(uint8_t seqNum, Endpoin
 {
     COMMAND_HEADER("RemoveGroup", GROUPS_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_REMOVE_GROUP_COMMAND_ID).Put16(groupId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_REMOVE_GROUP_COMMAND_ID)
+       .Put16(groupId)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2599,14 +3060,23 @@ PacketBufferHandle encodeGroupsClusterViewGroupCommand(uint8_t seqNum, EndpointI
 {
     COMMAND_HEADER("ViewGroup", GROUPS_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_VIEW_GROUP_COMMAND_ID).Put16(groupId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_VIEW_GROUP_COMMAND_ID)
+       .Put16(groupId)
+        ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeGroupsClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverGroupsAttributes", GROUPS_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -2616,7 +3086,10 @@ PacketBufferHandle encodeGroupsClusterDiscoverAttributes(uint8_t seqNum, Endpoin
 PacketBufferHandle encodeGroupsClusterReadNameSupportAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGroupsNameSupport", GROUPS_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
@@ -2626,7 +3099,10 @@ PacketBufferHandle encodeGroupsClusterReadNameSupportAttribute(uint8_t seqNum, E
 PacketBufferHandle encodeGroupsClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadGroupsClusterRevision", GROUPS_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -2647,7 +3123,11 @@ PacketBufferHandle encodeGroupsClusterReadClusterRevisionAttribute(uint8_t seqNu
 PacketBufferHandle encodeIasZoneClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverIasZoneAttributes", IAS_ZONE_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -2657,7 +3137,10 @@ PacketBufferHandle encodeIasZoneClusterDiscoverAttributes(uint8_t seqNum, Endpoi
 PacketBufferHandle encodeIasZoneClusterReadZoneStateAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIasZoneZoneState", IAS_ZONE_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
@@ -2667,7 +3150,10 @@ PacketBufferHandle encodeIasZoneClusterReadZoneStateAttribute(uint8_t seqNum, En
 PacketBufferHandle encodeIasZoneClusterReadZoneTypeAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIasZoneZoneType", IAS_ZONE_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -2677,7 +3163,10 @@ PacketBufferHandle encodeIasZoneClusterReadZoneTypeAttribute(uint8_t seqNum, End
 PacketBufferHandle encodeIasZoneClusterReadZoneStatusAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIasZoneZoneStatus", IAS_ZONE_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -2687,20 +3176,23 @@ PacketBufferHandle encodeIasZoneClusterReadZoneStatusAttribute(uint8_t seqNum, E
 PacketBufferHandle encodeIasZoneClusterReadIasCieAddressAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIasZoneIasCieAddress", IAS_ZONE_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0010);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0010);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeIasZoneClusterWriteIasCieAddressAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                   uint64_t iasCieAddress)
+PacketBufferHandle encodeIasZoneClusterWriteIasCieAddressAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint64_t iasCieAddress)
 {
     COMMAND_HEADER("WriteIasZoneIasCieAddress", IAS_ZONE_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0010)
-        .Put8(240)
-        .Put64(static_cast<uint64_t>(iasCieAddress));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0010)
+       .Put8(240)
+       .Put64(static_cast<uint64_t>(iasCieAddress))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -2710,7 +3202,10 @@ PacketBufferHandle encodeIasZoneClusterWriteIasCieAddressAttribute(uint8_t seqNu
 PacketBufferHandle encodeIasZoneClusterReadZoneIdAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIasZoneZoneId", IAS_ZONE_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0011);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0011);
     COMMAND_FOOTER();
 }
 
@@ -2720,7 +3215,10 @@ PacketBufferHandle encodeIasZoneClusterReadZoneIdAttribute(uint8_t seqNum, Endpo
 PacketBufferHandle encodeIasZoneClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIasZoneClusterRevision", IAS_ZONE_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -2743,7 +3241,12 @@ PacketBufferHandle encodeIdentifyClusterIdentifyCommand(uint8_t seqNum, Endpoint
 {
     COMMAND_HEADER("Identify", IDENTIFY_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_IDENTIFY_COMMAND_ID).Put16(identifyTime);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_IDENTIFY_COMMAND_ID)
+       .Put16(identifyTime)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2753,14 +3256,22 @@ PacketBufferHandle encodeIdentifyClusterIdentifyCommand(uint8_t seqNum, Endpoint
 PacketBufferHandle encodeIdentifyClusterIdentifyQueryCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("IdentifyQuery", IDENTIFY_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_IDENTIFY_QUERY_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_IDENTIFY_QUERY_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeIdentifyClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverIdentifyAttributes", IDENTIFY_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -2770,20 +3281,23 @@ PacketBufferHandle encodeIdentifyClusterDiscoverAttributes(uint8_t seqNum, Endpo
 PacketBufferHandle encodeIdentifyClusterReadIdentifyTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIdentifyIdentifyTime", IDENTIFY_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeIdentifyClusterWriteIdentifyTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                   uint16_t identifyTime)
+PacketBufferHandle encodeIdentifyClusterWriteIdentifyTimeAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t identifyTime)
 {
     COMMAND_HEADER("WriteIdentifyIdentifyTime", IDENTIFY_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
-        .Put16(0x0000)
-        .Put8(33)
-        .Put16(static_cast<uint16_t>(identifyTime));
+       .Put8(seqNum)
+       .Put8(ZCL_WRITE_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(33)
+       .Put16(static_cast<uint16_t>(identifyTime))
+       ;
     COMMAND_FOOTER();
 }
 
@@ -2793,7 +3307,10 @@ PacketBufferHandle encodeIdentifyClusterWriteIdentifyTimeAttribute(uint8_t seqNu
 PacketBufferHandle encodeIdentifyClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadIdentifyClusterRevision", IDENTIFY_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -2818,113 +3335,142 @@ PacketBufferHandle encodeIdentifyClusterReadClusterRevisionAttribute(uint8_t seq
 /*
  * Command Move
  */
-PacketBufferHandle encodeLevelControlClusterMoveCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode,
-                                                        uint8_t rate, uint8_t optionMask, uint8_t optionOverride)
+PacketBufferHandle encodeLevelControlClusterMoveCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride)
 {
     COMMAND_HEADER("Move", LEVEL_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_COMMAND_ID)
-        .Put8(moveMode)
-        .Put8(rate)
-        .Put8(optionMask)
-        .Put8(optionOverride);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_COMMAND_ID)
+       .Put8(moveMode)
+           .Put8(rate)
+           .Put8(optionMask)
+           .Put8(optionOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveToLevel
  */
-PacketBufferHandle encodeLevelControlClusterMoveToLevelCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t level,
-                                                               uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
+PacketBufferHandle encodeLevelControlClusterMoveToLevelCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
 {
     COMMAND_HEADER("MoveToLevel", LEVEL_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_TO_LEVEL_COMMAND_ID)
-        .Put8(level)
-        .Put16(transitionTime)
-        .Put8(optionMask)
-        .Put8(optionOverride);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_TO_LEVEL_COMMAND_ID)
+       .Put8(level)
+           .Put16(transitionTime)
+           .Put8(optionMask)
+           .Put8(optionOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveToLevelWithOnOff
  */
-PacketBufferHandle encodeLevelControlClusterMoveToLevelWithOnOffCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                        uint8_t level, uint16_t transitionTime)
+PacketBufferHandle encodeLevelControlClusterMoveToLevelWithOnOffCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t level, uint16_t transitionTime)
 {
     COMMAND_HEADER("MoveToLevelWithOnOff", LEVEL_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID)
-        .Put8(level)
-        .Put16(transitionTime);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID)
+       .Put8(level)
+           .Put16(transitionTime)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command MoveWithOnOff
  */
-PacketBufferHandle encodeLevelControlClusterMoveWithOnOffCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode,
-                                                                 uint8_t rate)
+PacketBufferHandle encodeLevelControlClusterMoveWithOnOffCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t moveMode, uint8_t rate)
 {
     COMMAND_HEADER("MoveWithOnOff", LEVEL_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_MOVE_WITH_ON_OFF_COMMAND_ID).Put8(moveMode).Put8(rate);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_MOVE_WITH_ON_OFF_COMMAND_ID)
+       .Put8(moveMode)
+           .Put8(rate)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command Step
  */
-PacketBufferHandle encodeLevelControlClusterStepCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode,
-                                                        uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask,
-                                                        uint8_t optionOverride)
+PacketBufferHandle encodeLevelControlClusterStepCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
 {
     COMMAND_HEADER("Step", LEVEL_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_STEP_COMMAND_ID)
-        .Put8(stepMode)
-        .Put8(stepSize)
-        .Put16(transitionTime)
-        .Put8(optionMask)
-        .Put8(optionOverride);
+
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STEP_COMMAND_ID)
+       .Put8(stepMode)
+           .Put8(stepSize)
+           .Put16(transitionTime)
+           .Put8(optionMask)
+           .Put8(optionOverride)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command StepWithOnOff
  */
-PacketBufferHandle encodeLevelControlClusterStepWithOnOffCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode,
-                                                                 uint8_t stepSize, uint16_t transitionTime)
+PacketBufferHandle encodeLevelControlClusterStepWithOnOffCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime)
 {
     COMMAND_HEADER("StepWithOnOff", LEVEL_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_STEP_WITH_ON_OFF_COMMAND_ID)
-        .Put8(stepMode)
-        .Put8(stepSize)
-        .Put16(transitionTime);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STEP_WITH_ON_OFF_COMMAND_ID)
+       .Put8(stepMode)
+           .Put8(stepSize)
+           .Put16(transitionTime)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command Stop
  */
-PacketBufferHandle encodeLevelControlClusterStopCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t optionMask,
-                                                        uint8_t optionOverride)
+PacketBufferHandle encodeLevelControlClusterStopCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint8_t optionMask, uint8_t optionOverride)
 {
     COMMAND_HEADER("Stop", LEVEL_CONTROL_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_STOP_COMMAND_ID).Put8(optionMask).Put8(optionOverride);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STOP_COMMAND_ID)
+       .Put8(optionMask)
+           .Put8(optionOverride)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -2934,14 +3480,22 @@ PacketBufferHandle encodeLevelControlClusterStopCommand(uint8_t seqNum, Endpoint
 PacketBufferHandle encodeLevelControlClusterStopWithOnOffCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("StopWithOnOff", LEVEL_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_STOP_WITH_ON_OFF_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STOP_WITH_ON_OFF_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeLevelControlClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverLevelControlAttributes", LEVEL_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -2951,23 +3505,24 @@ PacketBufferHandle encodeLevelControlClusterDiscoverAttributes(uint8_t seqNum, E
 PacketBufferHandle encodeLevelControlClusterReadCurrentLevelAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadLevelControlCurrentLevel", LEVEL_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                           uint16_t minInterval, uint16_t maxInterval,
-                                                                           uint8_t change)
+PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, uint8_t change)
 {
     COMMAND_HEADER("ReportLevelControlCurrentLevel", LEVEL_CONTROL_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0000)
-        .Put8(32)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0000)
+       .Put8(32)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     buf.Put8(static_cast<uint8_t>(change));
     COMMAND_FOOTER();
 }
@@ -2978,7 +3533,10 @@ PacketBufferHandle encodeLevelControlClusterConfigureCurrentLevelAttribute(uint8
 PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadLevelControlClusterRevision", LEVEL_CONTROL_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -2998,14 +3556,22 @@ PacketBufferHandle encodeLevelControlClusterReadClusterRevisionAttribute(uint8_t
 PacketBufferHandle encodeLowPowerClusterSleepCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("Sleep", LOW_POWER_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_SLEEP_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SLEEP_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeLowPowerClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverLowPowerAttributes", LOW_POWER_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -3015,7 +3581,10 @@ PacketBufferHandle encodeLowPowerClusterDiscoverAttributes(uint8_t seqNum, Endpo
 PacketBufferHandle encodeLowPowerClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadLowPowerClusterRevision", LOW_POWER_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -3040,9 +3609,7 @@ PacketBufferHandle encodeLowPowerClusterReadClusterRevisionAttribute(uint8_t seq
 /*
  * Command AddThreadNetwork
  */
-PacketBufferHandle encodeNetworkCommissioningClusterAddThreadNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                            chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                                            uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterAddThreadNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("AddThreadNetwork", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t operationalDatasetStrLen = operationalDataset.size();
@@ -3052,22 +3619,24 @@ PacketBufferHandle encodeNetworkCommissioningClusterAddThreadNetworkCommand(uint
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_ADD_THREAD_NETWORK_COMMAND_ID)
-        .Put(static_cast<uint8_t>(operationalDatasetStrLen))
-        .Put(operationalDataset.data(), operationalDataset.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ADD_THREAD_NETWORK_COMMAND_ID)
+       .Put(static_cast<uint8_t>(operationalDatasetStrLen))
+       .Put(operationalDataset.data(), operationalDataset.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command AddWiFiNetwork
  */
-PacketBufferHandle encodeNetworkCommissioningClusterAddWiFiNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                          chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                          uint64_t breadcrumb, uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterAddWiFiNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("AddWiFiNetwork", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t ssidStrLen = ssid.size();
@@ -3084,24 +3653,26 @@ PacketBufferHandle encodeNetworkCommissioningClusterAddWiFiNetworkCommand(uint8_
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_ADD_WI_FI_NETWORK_COMMAND_ID)
-        .Put(static_cast<uint8_t>(ssidStrLen))
-        .Put(ssid.data(), ssid.size())
-        .Put(static_cast<uint8_t>(credentialsStrLen))
-        .Put(credentials.data(), credentials.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ADD_WI_FI_NETWORK_COMMAND_ID)
+       .Put(static_cast<uint8_t>(ssidStrLen))
+       .Put(ssid.data(), ssid.size())
+       .Put(static_cast<uint8_t>(credentialsStrLen))
+       .Put(credentials.data(), credentials.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command DisableNetwork
  */
-PacketBufferHandle encodeNetworkCommissioningClusterDisableNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                          chip::ByteSpan networkID, uint64_t breadcrumb,
-                                                                          uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterDisableNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("DisableNetwork", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t networkIDStrLen = networkID.size();
@@ -3111,22 +3682,24 @@ PacketBufferHandle encodeNetworkCommissioningClusterDisableNetworkCommand(uint8_
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_DISABLE_NETWORK_COMMAND_ID)
-        .Put(static_cast<uint8_t>(networkIDStrLen))
-        .Put(networkID.data(), networkID.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISABLE_NETWORK_COMMAND_ID)
+       .Put(static_cast<uint8_t>(networkIDStrLen))
+       .Put(networkID.data(), networkID.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command EnableNetwork
  */
-PacketBufferHandle encodeNetworkCommissioningClusterEnableNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                         chip::ByteSpan networkID, uint64_t breadcrumb,
-                                                                         uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterEnableNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("EnableNetwork", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t networkIDStrLen = networkID.size();
@@ -3136,38 +3709,40 @@ PacketBufferHandle encodeNetworkCommissioningClusterEnableNetworkCommand(uint8_t
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_ENABLE_NETWORK_COMMAND_ID)
-        .Put(static_cast<uint8_t>(networkIDStrLen))
-        .Put(networkID.data(), networkID.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ENABLE_NETWORK_COMMAND_ID)
+       .Put(static_cast<uint8_t>(networkIDStrLen))
+       .Put(networkID.data(), networkID.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command GetLastNetworkCommissioningResult
  */
-PacketBufferHandle encodeNetworkCommissioningClusterGetLastNetworkCommissioningResultCommand(uint8_t seqNum,
-                                                                                             EndpointId destinationEndpoint,
-                                                                                             uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterGetLastNetworkCommissioningResultCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint32_t timeoutMs)
 {
     COMMAND_HEADER("GetLastNetworkCommissioningResult", NETWORK_COMMISSIONING_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID)
-        .Put32(timeoutMs);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID)
+       .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command RemoveNetwork
  */
-PacketBufferHandle encodeNetworkCommissioningClusterRemoveNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                         chip::ByteSpan networkID, uint64_t breadcrumb,
-                                                                         uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterRemoveNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("RemoveNetwork", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t networkIDStrLen = networkID.size();
@@ -3177,22 +3752,24 @@ PacketBufferHandle encodeNetworkCommissioningClusterRemoveNetworkCommand(uint8_t
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_REMOVE_NETWORK_COMMAND_ID)
-        .Put(static_cast<uint8_t>(networkIDStrLen))
-        .Put(networkID.data(), networkID.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_REMOVE_NETWORK_COMMAND_ID)
+       .Put(static_cast<uint8_t>(networkIDStrLen))
+       .Put(networkID.data(), networkID.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command ScanNetworks
  */
-PacketBufferHandle encodeNetworkCommissioningClusterScanNetworksCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                        chip::ByteSpan ssid, uint64_t breadcrumb,
-                                                                        uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterScanNetworksCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("ScanNetworks", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t ssidStrLen = ssid.size();
@@ -3202,22 +3779,24 @@ PacketBufferHandle encodeNetworkCommissioningClusterScanNetworksCommand(uint8_t
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_SCAN_NETWORKS_COMMAND_ID)
-        .Put(static_cast<uint8_t>(ssidStrLen))
-        .Put(ssid.data(), ssid.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_SCAN_NETWORKS_COMMAND_ID)
+       .Put(static_cast<uint8_t>(ssidStrLen))
+       .Put(ssid.data(), ssid.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command UpdateThreadNetwork
  */
-PacketBufferHandle encodeNetworkCommissioningClusterUpdateThreadNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                               chip::ByteSpan operationalDataset,
-                                                                               uint64_t breadcrumb, uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterUpdateThreadNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("UpdateThreadNetwork", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t operationalDatasetStrLen = operationalDataset.size();
@@ -3227,22 +3806,24 @@ PacketBufferHandle encodeNetworkCommissioningClusterUpdateThreadNetworkCommand(u
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID)
-        .Put(static_cast<uint8_t>(operationalDatasetStrLen))
-        .Put(operationalDataset.data(), operationalDataset.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID)
+       .Put(static_cast<uint8_t>(operationalDatasetStrLen))
+       .Put(operationalDataset.data(), operationalDataset.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command UpdateWiFiNetwork
  */
-PacketBufferHandle encodeNetworkCommissioningClusterUpdateWiFiNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint,
-                                                                             chip::ByteSpan ssid, chip::ByteSpan credentials,
-                                                                             uint64_t breadcrumb, uint32_t timeoutMs)
+PacketBufferHandle encodeNetworkCommissioningClusterUpdateWiFiNetworkCommand(uint8_t seqNum, EndpointId destinationEndpoint, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     COMMAND_HEADER("UpdateWiFiNetwork", NETWORK_COMMISSIONING_CLUSTER_ID);
     size_t ssidStrLen = ssid.size();
@@ -3259,22 +3840,30 @@ PacketBufferHandle encodeNetworkCommissioningClusterUpdateWiFiNetworkCommand(uin
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID)
-        .Put(static_cast<uint8_t>(ssidStrLen))
-        .Put(ssid.data(), ssid.size())
-        .Put(static_cast<uint8_t>(credentialsStrLen))
-        .Put(credentials.data(), credentials.size())
-        .Put64(breadcrumb)
-        .Put32(timeoutMs);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID)
+       .Put(static_cast<uint8_t>(ssidStrLen))
+       .Put(ssid.data(), ssid.size())
+       .Put(static_cast<uint8_t>(credentialsStrLen))
+       .Put(credentials.data(), credentials.size())
+       .Put64(breadcrumb)
+           .Put32(timeoutMs)
+        ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeNetworkCommissioningClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverNetworkCommissioningAttributes", NETWORK_COMMISSIONING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -3284,7 +3873,10 @@ PacketBufferHandle encodeNetworkCommissioningClusterDiscoverAttributes(uint8_t s
 PacketBufferHandle encodeNetworkCommissioningClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadNetworkCommissioningClusterRevision", NETWORK_COMMISSIONING_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -3307,7 +3899,11 @@ PacketBufferHandle encodeNetworkCommissioningClusterReadClusterRevisionAttribute
 PacketBufferHandle encodeOnOffClusterOffCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("Off", ON_OFF_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_OFF_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_OFF_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
@@ -3317,7 +3913,11 @@ PacketBufferHandle encodeOnOffClusterOffCommand(uint8_t seqNum, EndpointId desti
 PacketBufferHandle encodeOnOffClusterOnCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("On", ON_OFF_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_ON_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ON_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
@@ -3327,14 +3927,22 @@ PacketBufferHandle encodeOnOffClusterOnCommand(uint8_t seqNum, EndpointId destin
 PacketBufferHandle encodeOnOffClusterToggleCommand(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("Toggle", ON_OFF_CLUSTER_ID);
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_TOGGLE_COMMAND_ID);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_TOGGLE_COMMAND_ID)
+    ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeOnOffClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverOnOffAttributes", ON_OFF_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -3344,22 +3952,24 @@ PacketBufferHandle encodeOnOffClusterDiscoverAttributes(uint8_t seqNum, Endpoint
 PacketBufferHandle encodeOnOffClusterReadOnOffAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadOnOffOnOff", ON_OFF_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeOnOffClusterConfigureOnOffAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval,
-                                                             uint16_t maxInterval)
+PacketBufferHandle encodeOnOffClusterConfigureOnOffAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval)
 {
     COMMAND_HEADER("ReportOnOffOnOff", ON_OFF_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0000)
-        .Put8(16)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0000)
+       .Put8(16)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     COMMAND_FOOTER();
 }
 
@@ -3369,7 +3979,10 @@ PacketBufferHandle encodeOnOffClusterConfigureOnOffAttribute(uint8_t seqNum, End
 PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadOnOffClusterRevision", ON_OFF_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -3397,12 +4010,12 @@ PacketBufferHandle encodeOnOffClusterReadClusterRevisionAttribute(uint8_t seqNum
 /*
  * Command AddScene
  */
-PacketBufferHandle encodeScenesClusterAddSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId,
-                                                      uint8_t sceneId, uint16_t transitionTime, chip::ByteSpan sceneName,
-                                                      chip::ClusterId clusterId, uint8_t length, uint8_t value)
+PacketBufferHandle encodeScenesClusterAddSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::ByteSpan sceneName, chip::ClusterId clusterId, uint8_t length, uint8_t value)
 {
     COMMAND_HEADER("AddScene", SCENES_CLUSTER_ID);
 
+
+
     size_t sceneNameStrLen = sceneName.size();
     if (!CanCastTo<uint8_t>(sceneNameStrLen))
     {
@@ -3410,17 +4023,22 @@ PacketBufferHandle encodeScenesClusterAddSceneCommand(uint8_t seqNum, EndpointId
         return PacketBufferHandle();
     }
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_ADD_SCENE_COMMAND_ID)
-        .Put16(groupId)
-        .Put8(sceneId)
-        .Put16(transitionTime)
-        .Put(static_cast<uint8_t>(sceneNameStrLen))
-        .Put(sceneName.data(), sceneName.size())
-        .Put16(clusterId)
-        .Put8(length)
-        .Put8(value);
+
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_ADD_SCENE_COMMAND_ID)
+       .Put16(groupId)
+           .Put8(sceneId)
+           .Put16(transitionTime)
+           .Put(static_cast<uint8_t>(sceneNameStrLen))
+       .Put(sceneName.data(), sceneName.size())
+       .Put16(clusterId)
+           .Put8(length)
+           .Put8(value)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -3431,24 +4049,32 @@ PacketBufferHandle encodeScenesClusterGetSceneMembershipCommand(uint8_t seqNum,
 {
     COMMAND_HEADER("GetSceneMembership", SCENES_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID).Put16(groupId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID)
+       .Put16(groupId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command RecallScene
  */
-PacketBufferHandle encodeScenesClusterRecallSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId,
-                                                         uint8_t sceneId, uint16_t transitionTime)
+PacketBufferHandle encodeScenesClusterRecallSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime)
 {
     COMMAND_HEADER("RecallScene", SCENES_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_RECALL_SCENE_COMMAND_ID)
-        .Put16(groupId)
-        .Put8(sceneId)
-        .Put16(transitionTime);
+
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_RECALL_SCENE_COMMAND_ID)
+       .Put16(groupId)
+           .Put8(sceneId)
+           .Put16(transitionTime)
+        ;
     COMMAND_FOOTER();
 }
 
@@ -3459,50 +4085,77 @@ PacketBufferHandle encodeScenesClusterRemoveAllScenesCommand(uint8_t seqNum, End
 {
     COMMAND_HEADER("RemoveAllScenes", SCENES_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_REMOVE_ALL_SCENES_COMMAND_ID).Put16(groupId);
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_REMOVE_ALL_SCENES_COMMAND_ID)
+       .Put16(groupId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command RemoveScene
  */
-PacketBufferHandle encodeScenesClusterRemoveSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId,
-                                                         uint8_t sceneId)
+PacketBufferHandle encodeScenesClusterRemoveSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId)
 {
     COMMAND_HEADER("RemoveScene", SCENES_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_REMOVE_SCENE_COMMAND_ID).Put16(groupId).Put8(sceneId);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_REMOVE_SCENE_COMMAND_ID)
+       .Put16(groupId)
+           .Put8(sceneId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command StoreScene
  */
-PacketBufferHandle encodeScenesClusterStoreSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId,
-                                                        uint8_t sceneId)
+PacketBufferHandle encodeScenesClusterStoreSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId)
 {
     COMMAND_HEADER("StoreScene", SCENES_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_STORE_SCENE_COMMAND_ID).Put16(groupId).Put8(sceneId);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_STORE_SCENE_COMMAND_ID)
+       .Put16(groupId)
+           .Put8(sceneId)
+        ;
     COMMAND_FOOTER();
 }
 
 /*
  * Command ViewScene
  */
-PacketBufferHandle encodeScenesClusterViewSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId,
-                                                       uint8_t sceneId)
+PacketBufferHandle encodeScenesClusterViewSceneCommand(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t groupId, uint8_t sceneId)
 {
     COMMAND_HEADER("ViewScene", SCENES_CLUSTER_ID);
 
-    buf.Put8(kFrameControlClusterSpecificCommand).Put8(seqNum).Put8(ZCL_VIEW_SCENE_COMMAND_ID).Put16(groupId).Put8(sceneId);
+
+      buf
+        .Put8(kFrameControlClusterSpecificCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_VIEW_SCENE_COMMAND_ID)
+       .Put16(groupId)
+           .Put8(sceneId)
+        ;
     COMMAND_FOOTER();
 }
 
 PacketBufferHandle encodeScenesClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverScenesAttributes", SCENES_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -3512,7 +4165,10 @@ PacketBufferHandle encodeScenesClusterDiscoverAttributes(uint8_t seqNum, Endpoin
 PacketBufferHandle encodeScenesClusterReadSceneCountAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadScenesSceneCount", SCENES_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
@@ -3522,7 +4178,10 @@ PacketBufferHandle encodeScenesClusterReadSceneCountAttribute(uint8_t seqNum, En
 PacketBufferHandle encodeScenesClusterReadCurrentSceneAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadScenesCurrentScene", SCENES_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -3532,7 +4191,10 @@ PacketBufferHandle encodeScenesClusterReadCurrentSceneAttribute(uint8_t seqNum,
 PacketBufferHandle encodeScenesClusterReadCurrentGroupAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadScenesCurrentGroup", SCENES_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -3542,7 +4204,10 @@ PacketBufferHandle encodeScenesClusterReadCurrentGroupAttribute(uint8_t seqNum,
 PacketBufferHandle encodeScenesClusterReadSceneValidAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadScenesSceneValid", SCENES_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0003);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0003);
     COMMAND_FOOTER();
 }
 
@@ -3552,7 +4217,10 @@ PacketBufferHandle encodeScenesClusterReadSceneValidAttribute(uint8_t seqNum, En
 PacketBufferHandle encodeScenesClusterReadNameSupportAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadScenesNameSupport", SCENES_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0004);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0004);
     COMMAND_FOOTER();
 }
 
@@ -3562,7 +4230,10 @@ PacketBufferHandle encodeScenesClusterReadNameSupportAttribute(uint8_t seqNum, E
 PacketBufferHandle encodeScenesClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadScenesClusterRevision", SCENES_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
 
@@ -3581,7 +4252,11 @@ PacketBufferHandle encodeScenesClusterReadClusterRevisionAttribute(uint8_t seqNu
 PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("DiscoverTemperatureMeasurementAttributes", TEMP_MEASUREMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID).Put16(0x0000).Put8(0xFF);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000)
+       .Put8(0xFF);
     COMMAND_FOOTER();
 }
 
@@ -3591,24 +4266,24 @@ PacketBufferHandle encodeTemperatureMeasurementClusterDiscoverAttributes(uint8_t
 PacketBufferHandle encodeTemperatureMeasurementClusterReadMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0000);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0000);
     COMMAND_FOOTER();
 }
 
-PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttribute(uint8_t seqNum,
-                                                                                      EndpointId destinationEndpoint,
-                                                                                      uint16_t minInterval, uint16_t maxInterval,
-                                                                                      int16_t change)
+PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint, uint16_t minInterval, uint16_t maxInterval, int16_t change)
 {
     COMMAND_HEADER("ReportTemperatureMeasurementMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID);
     buf.Put8(kFrameControlGlobalCommand)
-        .Put8(seqNum)
-        .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
-        .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
-        .Put16(0x0000)
-        .Put8(41)
-        .Put16(minInterval)
-        .Put16(maxInterval);
+       .Put8(seqNum)
+       .Put8(ZCL_CONFIGURE_REPORTING_COMMAND_ID)
+       .Put8(EMBER_ZCL_REPORTING_DIRECTION_REPORTED)
+       .Put16(0x0000)
+       .Put8(41)
+       .Put16(minInterval)
+       .Put16(maxInterval);
     buf.Put16(static_cast<uint16_t>(change));
     COMMAND_FOOTER();
 }
@@ -3619,7 +4294,10 @@ PacketBufferHandle encodeTemperatureMeasurementClusterConfigureMeasuredValueAttr
 PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadTemperatureMeasurementMinMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0001);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0001);
     COMMAND_FOOTER();
 }
 
@@ -3629,7 +4307,10 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMinMeasuredValueAttrib
 PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadTemperatureMeasurementMaxMeasuredValue", TEMP_MEASUREMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0x0002);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0x0002);
     COMMAND_FOOTER();
 }
 
@@ -3639,6 +4320,10 @@ PacketBufferHandle encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttrib
 PacketBufferHandle encodeTemperatureMeasurementClusterReadClusterRevisionAttribute(uint8_t seqNum, EndpointId destinationEndpoint)
 {
     COMMAND_HEADER("ReadTemperatureMeasurementClusterRevision", TEMP_MEASUREMENT_CLUSTER_ID);
-    buf.Put8(kFrameControlGlobalCommand).Put8(seqNum).Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID).Put16(0xFFFD);
+    buf.Put8(kFrameControlGlobalCommand)
+       .Put8(seqNum)
+       .Put8(ZCL_READ_ATTRIBUTES_COMMAND_ID)
+       .Put16(0xFFFD);
     COMMAND_FOOTER();
 }
+
diff --git a/src/controller/CHIPClusters.cpp b/src/controller/CHIPClusters.cpp
index adb6a8dba4c3ef..1770928114b0c7 100644
--- a/src/controller/CHIPClusters.cpp
+++ b/src/controller/CHIPClusters.cpp
@@ -30,93 +30,85 @@ namespace Controller {
 // TODO(#4503): length should be passed to commands when byte string is in argument list.
 // TODO(#4503): Commands should take group id as an argument.
 
+
 // ApplicationBasic Cluster Commands
 // ApplicationBasic Cluster Attributes
-CHIP_ERROR ApplicationBasicCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeVendorName(Callback::Cancelable * onSuccessCallback,
-                                                            Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeVendorName(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadVendorNameAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeVendorId(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeVendorId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadVendorIdAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeApplicationName(Callback::Cancelable * onSuccessCallback,
-                                                                 Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeApplicationName(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadApplicationNameAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeProductId(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeProductId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadProductIdAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeApplicationId(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeApplicationId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadApplicationIdAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeCatalogVendorId(Callback::Cancelable * onSuccessCallback,
-                                                                 Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeCatalogVendorId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadCatalogVendorIdAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeApplicationSatus(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeApplicationSatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadApplicationSatusAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ApplicationBasicCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                                 Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ApplicationBasicCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeApplicationBasicClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // BarrierControl Cluster Commands
-CHIP_ERROR BarrierControlCluster::BarrierControlGoToPercent(Callback::Cancelable * onSuccessCallback,
-                                                            Callback::Cancelable * onFailureCallback, uint8_t percentOpen)
+CHIP_ERROR BarrierControlCluster::BarrierControlGoToPercent(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t percentOpen)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kBarrierControlGoToPercentCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -132,25 +124,23 @@ CHIP_ERROR BarrierControlCluster::BarrierControlGoToPercent(Callback::Cancelable
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeBarrierControlClusterBarrierControlGoToPercentCommand(seqNum, mEndpoint, percentOpen);
+    System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterBarrierControlGoToPercentCommand(seqNum, mEndpoint, percentOpen);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR BarrierControlCluster::BarrierControlStop(Callback::Cancelable * onSuccessCallback,
-                                                     Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BarrierControlCluster::BarrierControlStop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kBarrierControlStopCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -163,73 +153,68 @@ CHIP_ERROR BarrierControlCluster::BarrierControlStop(Callback::Cancelable * onSu
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterBarrierControlStopCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
 // BarrierControl Cluster Attributes
-CHIP_ERROR BarrierControlCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                     Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BarrierControlCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierMovingState(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierMovingState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterReadBarrierMovingStateAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierSafetyStatus(Callback::Cancelable * onSuccessCallback,
-                                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierSafetyStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterReadBarrierSafetyStatusAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierCapabilities(Callback::Cancelable * onSuccessCallback,
-                                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierCapabilities(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterReadBarrierCapabilitiesAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierPosition(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BarrierControlCluster::ReadAttributeBarrierPosition(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterReadBarrierPositionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BarrierControlCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BarrierControlCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBarrierControlClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // Basic Cluster Commands
 CHIP_ERROR BasicCluster::MfgSpecificPing(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMfgSpecificPingCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -242,7 +227,7 @@ CHIP_ERROR BasicCluster::MfgSpecificPing(Callback::Cancelable * onSuccessCallbac
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterMfgSpecificPingCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -251,131 +236,122 @@ CHIP_ERROR BasicCluster::MfgSpecificPing(Callback::Cancelable * onSuccessCallbac
 // Basic Cluster Attributes
 CHIP_ERROR BasicCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR BasicCluster::ReadAttributeInteractionModelVersion(Callback::Cancelable * onSuccessCallback,
-                                                              Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BasicCluster::ReadAttributeInteractionModelVersion(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadInteractionModelVersionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
 CHIP_ERROR BasicCluster::ReadAttributeVendorName(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadVendorNameAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
 CHIP_ERROR BasicCluster::ReadAttributeVendorID(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadVendorIDAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::ReadAttributeProductName(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BasicCluster::ReadAttributeProductName(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadProductNameAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
 CHIP_ERROR BasicCluster::ReadAttributeProductID(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadProductIDAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
 CHIP_ERROR BasicCluster::ReadAttributeUserLabel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadUserLabelAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::WriteAttributeUserLabel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 chip::ByteSpan value)
+CHIP_ERROR BasicCluster::WriteAttributeUserLabel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterWriteUserLabelAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
 CHIP_ERROR BasicCluster::ReadAttributeLocation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadLocationAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::WriteAttributeLocation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                chip::ByteSpan value)
+CHIP_ERROR BasicCluster::WriteAttributeLocation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterWriteLocationAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::ReadAttributeHardwareVersion(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BasicCluster::ReadAttributeHardwareVersion(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadHardwareVersionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::ReadAttributeHardwareVersionString(Callback::Cancelable * onSuccessCallback,
-                                                            Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BasicCluster::ReadAttributeHardwareVersionString(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadHardwareVersionStringAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::ReadAttributeSoftwareVersion(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BasicCluster::ReadAttributeSoftwareVersion(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadSoftwareVersionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::ReadAttributeSoftwareVersionString(Callback::Cancelable * onSuccessCallback,
-                                                            Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BasicCluster::ReadAttributeSoftwareVersionString(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadSoftwareVersionStringAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR BasicCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BasicCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBasicClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // Binding Cluster Commands
-CHIP_ERROR BindingCluster::Bind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
+CHIP_ERROR BindingCluster::Bind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kBindCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -397,26 +373,23 @@ CHIP_ERROR BindingCluster::Bind(Callback::Cancelable * onSuccessCallback, Callba
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeBindingClusterBindCommand(seqNum, mEndpoint, nodeId, groupId, endpointId, clusterId);
+    System::PacketBufferHandle encodedCommand = encodeBindingClusterBindCommand(seqNum, mEndpoint, nodeId, groupId, endpointId, clusterId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR BindingCluster::Unbind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId,
-                                  chip::ClusterId clusterId)
+CHIP_ERROR BindingCluster::Unbind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kUnbindCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -438,8 +411,7 @@ CHIP_ERROR BindingCluster::Unbind(Callback::Cancelable * onSuccessCallback, Call
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeBindingClusterUnbindCommand(seqNum, mEndpoint, nodeId, groupId, endpointId, clusterId);
+    System::PacketBufferHandle encodedCommand = encodeBindingClusterUnbindCommand(seqNum, mEndpoint, nodeId, groupId, endpointId, clusterId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
@@ -447,32 +419,31 @@ CHIP_ERROR BindingCluster::Unbind(Callback::Cancelable * onSuccessCallback, Call
 // Binding Cluster Attributes
 CHIP_ERROR BindingCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBindingClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR BindingCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                        Callback::Cancelable * onFailureCallback)
+CHIP_ERROR BindingCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeBindingClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // ColorControl Cluster Commands
-CHIP_ERROR ColorControlCluster::MoveColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveColorCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -494,27 +465,23 @@ CHIP_ERROR ColorControlCluster::MoveColor(Callback::Cancelable * onSuccessCallba
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterMoveColorCommand(seqNum, mEndpoint, rateX, rateY, optionsMask, optionsOverride);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveColorCommand(seqNum, mEndpoint, rateX, rateY, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveColorTemperature(Callback::Cancelable * onSuccessCallback,
-                                                     Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint16_t rate,
-                                                     uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum,
-                                                     uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveColorTemperatureCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -539,26 +506,24 @@ CHIP_ERROR ColorControlCluster::MoveColorTemperature(Callback::Cancelable * onSu
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveColorTemperatureCommand(
-        seqNum, mEndpoint, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveColorTemperatureCommand(seqNum, mEndpoint, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                        uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveHueCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -580,25 +545,23 @@ CHIP_ERROR ColorControlCluster::MoveHue(Callback::Cancelable * onSuccessCallback
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterMoveHueCommand(seqNum, mEndpoint, moveMode, rate, optionsMask, optionsOverride);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveHueCommand(seqNum, mEndpoint, moveMode, rate, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveSaturationCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -620,26 +583,23 @@ CHIP_ERROR ColorControlCluster::MoveSaturation(Callback::Cancelable * onSuccessC
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterMoveSaturationCommand(seqNum, mEndpoint, moveMode, rate, optionsMask, optionsOverride);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveSaturationCommand(seqNum, mEndpoint, moveMode, rate, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveToColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                            uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask,
-                                            uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveToColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveToColorCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -662,27 +622,24 @@ CHIP_ERROR ColorControlCluster::MoveToColor(Callback::Cancelable * onSuccessCall
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToColorCommand(
-        seqNum, mEndpoint, colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToColorCommand(seqNum, mEndpoint, colorX, colorY, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveToColorTemperature(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback, uint16_t colorTemperature,
-                                                       uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveToColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveToColorTemperatureCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -703,27 +660,24 @@ CHIP_ERROR ColorControlCluster::MoveToColorTemperature(Callback::Cancelable * on
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToColorTemperatureCommand(
-        seqNum, mEndpoint, colorTemperature, transitionTime, optionsMask, optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToColorTemperatureCommand(seqNum, mEndpoint, colorTemperature, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveToHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask,
-                                          uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveToHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveToHueCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -747,26 +701,23 @@ CHIP_ERROR ColorControlCluster::MoveToHue(Callback::Cancelable * onSuccessCallba
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterMoveToHueCommand(seqNum, mEndpoint, hue, direction, transitionTime, optionsMask, optionsOverride);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToHueCommand(seqNum, mEndpoint, hue, direction, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveToHueAndSaturation(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback, uint8_t hue, uint8_t saturation,
-                                                       uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveToHueAndSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveToHueAndSaturationCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -789,27 +740,24 @@ CHIP_ERROR ColorControlCluster::MoveToHueAndSaturation(Callback::Cancelable * on
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToHueAndSaturationCommand(
-        seqNum, mEndpoint, hue, saturation, transitionTime, optionsMask, optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToHueAndSaturationCommand(seqNum, mEndpoint, hue, saturation, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::MoveToSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask,
-                                                 uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::MoveToSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveToSaturationCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -830,27 +778,24 @@ CHIP_ERROR ColorControlCluster::MoveToSaturation(Callback::Cancelable * onSucces
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToSaturationCommand(
-        seqNum, mEndpoint, saturation, transitionTime, optionsMask, optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterMoveToSaturationCommand(seqNum, mEndpoint, saturation, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::StepColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask,
-                                          uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::StepColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStepColorCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -874,27 +819,23 @@ CHIP_ERROR ColorControlCluster::StepColor(Callback::Cancelable * onSuccessCallba
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterStepColorCommand(seqNum, mEndpoint, stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStepColorCommand(seqNum, mEndpoint, stepX, stepY, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::StepColorTemperature(Callback::Cancelable * onSuccessCallback,
-                                                     Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint16_t stepSize,
-                                                     uint16_t transitionTime, uint16_t colorTemperatureMinimum,
-                                                     uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::StepColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStepColorTemperatureCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -921,28 +862,24 @@ CHIP_ERROR ColorControlCluster::StepColorTemperature(Callback::Cancelable * onSu
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStepColorTemperatureCommand(
-        seqNum, mEndpoint, stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,
-        optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStepColorTemperatureCommand(seqNum, mEndpoint, stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::StepHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                        uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask,
-                                        uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::StepHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStepHueCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -965,27 +902,24 @@ CHIP_ERROR ColorControlCluster::StepHue(Callback::Cancelable * onSuccessCallback
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStepHueCommand(
-        seqNum, mEndpoint, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStepHueCommand(seqNum, mEndpoint, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::StepSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask,
-                                               uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::StepSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStepSaturationCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1008,26 +942,24 @@ CHIP_ERROR ColorControlCluster::StepSaturation(Callback::Cancelable * onSuccessC
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStepSaturationCommand(
-        seqNum, mEndpoint, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStepSaturationCommand(seqNum, mEndpoint, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ColorControlCluster::StopMoveStep(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                             uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR ColorControlCluster::StopMoveStep(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t optionsMask, uint8_t optionsOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStopMoveStepCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1045,35 +977,29 @@ CHIP_ERROR ColorControlCluster::StopMoveStep(Callback::Cancelable * onSuccessCal
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterStopMoveStepCommand(seqNum, mEndpoint, optionsMask, optionsOverride);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterStopMoveStepCommand(seqNum, mEndpoint, optionsMask, optionsOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
 // ColorControl Cluster Attributes
-CHIP_ERROR ColorControlCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR ColorControlCluster::ReadAttributeCurrentHue(Callback::Cancelable * onSuccessCallback,
-                                                        Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeCurrentHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadCurrentHueAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentHue(Callback::Cancelable * onSuccessCallback,
-                                                             Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                             uint16_t maxInterval, uint8_t change)
+CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint8_t change)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterConfigureCurrentHueAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterConfigureCurrentHueAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -1082,21 +1008,17 @@ CHIP_ERROR ColorControlCluster::ReportAttributeCurrentHue(Callback::Cancelable *
     return RequestAttributeReporting(0x0000, onReportCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeCurrentSaturation(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeCurrentSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadCurrentSaturationAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentSaturation(Callback::Cancelable * onSuccessCallback,
-                                                                    Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                                    uint16_t maxInterval, uint8_t change)
+CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint8_t change)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterConfigureCurrentSaturationAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterConfigureCurrentSaturationAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -1105,29 +1027,24 @@ CHIP_ERROR ColorControlCluster::ReportAttributeCurrentSaturation(Callback::Cance
     return RequestAttributeReporting(0x0001, onReportCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeRemainingTime(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeRemainingTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadRemainingTimeAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeCurrentX(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeCurrentX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadCurrentXAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentX(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                           uint16_t maxInterval, uint16_t change)
+CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint16_t change)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterConfigureCurrentXAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterConfigureCurrentXAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -1136,21 +1053,17 @@ CHIP_ERROR ColorControlCluster::ReportAttributeCurrentX(Callback::Cancelable * o
     return RequestAttributeReporting(0x0003, onReportCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeCurrentY(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeCurrentY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadCurrentYAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentY(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                           uint16_t maxInterval, uint16_t change)
+CHIP_ERROR ColorControlCluster::ConfigureAttributeCurrentY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint16_t change)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterConfigureCurrentYAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterConfigureCurrentYAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -1159,37 +1072,31 @@ CHIP_ERROR ColorControlCluster::ReportAttributeCurrentY(Callback::Cancelable * o
     return RequestAttributeReporting(0x0004, onReportCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeDriftCompensation(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeDriftCompensation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadDriftCompensationAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeCompensationText(Callback::Cancelable * onSuccessCallback,
-                                                              Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeCompensationText(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadCompensationTextAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorTemperature(Callback::Cancelable * onSuccessCallback,
-                                                              Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorTemperatureAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ConfigureAttributeColorTemperature(Callback::Cancelable * onSuccessCallback,
-                                                                   Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                                   uint16_t maxInterval, uint16_t change)
+CHIP_ERROR ColorControlCluster::ConfigureAttributeColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint16_t change)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterConfigureColorTemperatureAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterConfigureColorTemperatureAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -1198,475 +1105,412 @@ CHIP_ERROR ColorControlCluster::ReportAttributeColorTemperature(Callback::Cancel
     return RequestAttributeReporting(0x0007, onReportCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorMode(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorMode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorModeAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorControlOptions(Callback::Cancelable * onSuccessCallback,
-                                                                 Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorControlOptions(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorControlOptionsAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorControlOptions(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback, uint8_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorControlOptions(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterWriteColorControlOptionsAttribute(seqNum, mEndpoint, value);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorControlOptionsAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeNumberOfPrimaries(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeNumberOfPrimaries(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadNumberOfPrimariesAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary1X(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary1X(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary1XAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary1Y(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary1Y(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary1YAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary1Intensity(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary1Intensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary1IntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary2X(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary2X(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary2XAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary2Y(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary2Y(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary2YAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary2Intensity(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary2Intensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary2IntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary3X(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary3X(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary3XAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary3Y(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary3Y(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary3YAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary3Intensity(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary3Intensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary3IntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary4X(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary4X(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary4XAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary4Y(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary4Y(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary4YAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary4Intensity(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary4Intensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary4IntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary5X(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary5X(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary5XAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary5Y(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary5Y(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary5YAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary5Intensity(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary5Intensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary5IntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary6X(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary6X(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary6XAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary6Y(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary6Y(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary6YAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributePrimary6Intensity(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributePrimary6Intensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadPrimary6IntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeWhitePointX(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeWhitePointX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadWhitePointXAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeWhitePointX(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeWhitePointX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteWhitePointXAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeWhitePointY(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeWhitePointY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadWhitePointYAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeWhitePointY(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeWhitePointY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteWhitePointYAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointRX(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointRX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointRXAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointRX(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointRX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointRXAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointRY(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointRY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointRYAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointRY(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointRY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointRYAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointRIntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback,
-                                                                   Callback::Cancelable * onFailureCallback, uint8_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterWriteColorPointRIntensityAttribute(seqNum, mEndpoint, value);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointRIntensityAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointGX(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointGX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointGXAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointGX(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointGX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointGXAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointGY(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointGY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointGYAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointGY(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointGY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointGYAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointGIntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback,
-                                                                   Callback::Cancelable * onFailureCallback, uint8_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterWriteColorPointGIntensityAttribute(seqNum, mEndpoint, value);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointGIntensityAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointBX(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointBX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointBXAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointBX(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointBX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointBXAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointBY(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointBY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointBYAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointBY(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointBY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointBYAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorPointBIntensityAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback,
-                                                                   Callback::Cancelable * onFailureCallback, uint8_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterWriteColorPointBIntensityAttribute(seqNum, mEndpoint, value);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteColorPointBIntensityAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeEnhancedCurrentHue(Callback::Cancelable * onSuccessCallback,
-                                                                Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeEnhancedCurrentHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadEnhancedCurrentHueAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeEnhancedColorMode(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeEnhancedColorMode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadEnhancedColorModeAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorLoopActive(Callback::Cancelable * onSuccessCallback,
-                                                             Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorLoopActive(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorLoopActiveAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorLoopDirection(Callback::Cancelable * onSuccessCallback,
-                                                                Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorLoopDirection(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorLoopDirectionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorLoopTime(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorLoopTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorLoopTimeAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorCapabilities(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorCapabilities(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorCapabilitiesAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorTempPhysicalMin(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorTempPhysicalMin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorTempPhysicalMinAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeColorTempPhysicalMax(Callback::Cancelable * onSuccessCallback,
-                                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeColorTempPhysicalMax(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadColorTempPhysicalMaxAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeCoupleColorTempToLevelMinMireds(Callback::Cancelable * onSuccessCallback,
-                                                                             Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeCoupleColorTempToLevelMinMireds(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterReadCoupleColorTempToLevelMinMiredsAttribute(seqNum, mEndpoint);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadCoupleColorTempToLevelMinMiredsAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback,
-                                                                           Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterReadStartUpColorTemperatureMiredsAttribute(seqNum, mEndpoint);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadStartUpColorTemperatureMiredsAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::WriteAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback,
-                                                                            Callback::Cancelable * onFailureCallback,
-                                                                            uint16_t value)
+CHIP_ERROR ColorControlCluster::WriteAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeColorControlClusterWriteStartUpColorTemperatureMiredsAttribute(seqNum, mEndpoint, value);
+    System::PacketBufferHandle encodedCommand = encodeColorControlClusterWriteStartUpColorTemperatureMiredsAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ColorControlCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                             Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ColorControlCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeColorControlClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // DoorLock Cluster Commands
 CHIP_ERROR DoorLockCluster::ClearAllPins(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kClearAllPinsCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1679,7 +1523,7 @@ CHIP_ERROR DoorLockCluster::ClearAllPins(Callback::Cancelable * onSuccessCallbac
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterClearAllPinsCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -1690,13 +1534,13 @@ CHIP_ERROR DoorLockCluster::ClearAllRfids(Callback::Cancelable * onSuccessCallba
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kClearAllRfidsCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1709,25 +1553,24 @@ CHIP_ERROR DoorLockCluster::ClearAllRfids(Callback::Cancelable * onSuccessCallba
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterClearAllRfidsCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::ClearHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 uint8_t scheduleId)
+CHIP_ERROR DoorLockCluster::ClearHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kClearHolidayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1742,25 +1585,24 @@ CHIP_ERROR DoorLockCluster::ClearHolidaySchedule(Callback::Cancelable * onSucces
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterClearHolidayScheduleCommand(seqNum, mEndpoint, scheduleId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::ClearPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     uint16_t userId)
+CHIP_ERROR DoorLockCluster::ClearPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kClearPinCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1775,25 +1617,24 @@ CHIP_ERROR DoorLockCluster::ClearPin(Callback::Cancelable * onSuccessCallback, C
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterClearPinCommand(seqNum, mEndpoint, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::ClearRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                      uint16_t userId)
+CHIP_ERROR DoorLockCluster::ClearRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kClearRfidCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1808,25 +1649,24 @@ CHIP_ERROR DoorLockCluster::ClearRfid(Callback::Cancelable * onSuccessCallback,
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterClearRfidCommand(seqNum, mEndpoint, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::ClearWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR DoorLockCluster::ClearWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kClearWeekdayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1844,25 +1684,23 @@ CHIP_ERROR DoorLockCluster::ClearWeekdaySchedule(Callback::Cancelable * onSucces
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterClearWeekdayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterClearWeekdayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::ClearYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR DoorLockCluster::ClearYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kClearYeardayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1880,25 +1718,23 @@ CHIP_ERROR DoorLockCluster::ClearYeardaySchedule(Callback::Cancelable * onSucces
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterClearYeardayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterClearYeardayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::GetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t scheduleId)
+CHIP_ERROR DoorLockCluster::GetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetHolidayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1913,25 +1749,24 @@ CHIP_ERROR DoorLockCluster::GetHolidaySchedule(Callback::Cancelable * onSuccessC
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterGetHolidayScheduleCommand(seqNum, mEndpoint, scheduleId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::GetLogRecord(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                         uint16_t logIndex)
+CHIP_ERROR DoorLockCluster::GetLogRecord(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t logIndex)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetLogRecordCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1946,25 +1781,24 @@ CHIP_ERROR DoorLockCluster::GetLogRecord(Callback::Cancelable * onSuccessCallbac
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterGetLogRecordCommand(seqNum, mEndpoint, logIndex);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::GetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                   uint16_t userId)
+CHIP_ERROR DoorLockCluster::GetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetPinCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -1979,25 +1813,24 @@ CHIP_ERROR DoorLockCluster::GetPin(Callback::Cancelable * onSuccessCallback, Cal
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterGetPinCommand(seqNum, mEndpoint, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::GetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint16_t userId)
+CHIP_ERROR DoorLockCluster::GetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetRfidCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2012,25 +1845,24 @@ CHIP_ERROR DoorLockCluster::GetRfid(Callback::Cancelable * onSuccessCallback, Ca
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterGetRfidCommand(seqNum, mEndpoint, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::GetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                        uint16_t userId)
+CHIP_ERROR DoorLockCluster::GetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetUserTypeCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2045,25 +1877,24 @@ CHIP_ERROR DoorLockCluster::GetUserType(Callback::Cancelable * onSuccessCallback
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterGetUserTypeCommand(seqNum, mEndpoint, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::GetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR DoorLockCluster::GetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetWeekdayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2081,25 +1912,23 @@ CHIP_ERROR DoorLockCluster::GetWeekdaySchedule(Callback::Cancelable * onSuccessC
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterGetWeekdayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterGetWeekdayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::GetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR DoorLockCluster::GetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetYeardayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2117,25 +1946,23 @@ CHIP_ERROR DoorLockCluster::GetYeardaySchedule(Callback::Cancelable * onSuccessC
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterGetYeardayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterGetYeardayScheduleCommand(seqNum, mEndpoint, scheduleId, userId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::LockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     chip::ByteSpan pin)
+CHIP_ERROR DoorLockCluster::LockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan pin)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kLockDoorCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2150,26 +1977,24 @@ CHIP_ERROR DoorLockCluster::LockDoor(Callback::Cancelable * onSuccessCallback, C
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterLockDoorCommand(seqNum, mEndpoint, pin);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::SetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime,
-                                               uint8_t operatingModeDuringHoliday)
+CHIP_ERROR DoorLockCluster::SetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSetHolidayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2190,26 +2015,24 @@ CHIP_ERROR DoorLockCluster::SetHolidaySchedule(Callback::Cancelable * onSuccessC
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetHolidayScheduleCommand(
-        seqNum, mEndpoint, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetHolidayScheduleCommand(seqNum, mEndpoint, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::SetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                   uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
+CHIP_ERROR DoorLockCluster::SetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSetPinCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2231,25 +2054,23 @@ CHIP_ERROR DoorLockCluster::SetPin(Callback::Cancelable * onSuccessCallback, Cal
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterSetPinCommand(seqNum, mEndpoint, userId, userStatus, userType, pin);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetPinCommand(seqNum, mEndpoint, userId, userStatus, userType, pin);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::SetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan id)
+CHIP_ERROR DoorLockCluster::SetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan id)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSetRfidCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2271,25 +2092,23 @@ CHIP_ERROR DoorLockCluster::SetRfid(Callback::Cancelable * onSuccessCallback, Ca
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterSetRfidCommand(seqNum, mEndpoint, userId, userStatus, userType, id);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetRfidCommand(seqNum, mEndpoint, userId, userStatus, userType, id);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::SetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                        uint16_t userId, uint8_t userType)
+CHIP_ERROR DoorLockCluster::SetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, uint8_t userType)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSetUserTypeCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2306,26 +2125,24 @@ CHIP_ERROR DoorLockCluster::SetUserType(Callback::Cancelable * onSuccessCallback
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetUserTypeCommand(seqNum, mEndpoint, userId, userType);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::SetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour,
-                                               uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+CHIP_ERROR DoorLockCluster::SetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSetWeekdayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2352,26 +2169,24 @@ CHIP_ERROR DoorLockCluster::SetWeekdaySchedule(Callback::Cancelable * onSuccessC
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetWeekdayScheduleCommand(
-        seqNum, mEndpoint, scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetWeekdayScheduleCommand(seqNum, mEndpoint, scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::SetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime)
+CHIP_ERROR DoorLockCluster::SetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSetYeardayScheduleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2393,25 +2208,23 @@ CHIP_ERROR DoorLockCluster::SetYeardaySchedule(Callback::Cancelable * onSuccessC
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterSetYeardayScheduleCommand(seqNum, mEndpoint, scheduleId, userId, localStartTime, localEndTime);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterSetYeardayScheduleCommand(seqNum, mEndpoint, scheduleId, userId, localStartTime, localEndTime);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::UnlockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                       chip::ByteSpan pin)
+CHIP_ERROR DoorLockCluster::UnlockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan pin)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kUnlockDoorCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2426,25 +2239,24 @@ CHIP_ERROR DoorLockCluster::UnlockDoor(Callback::Cancelable * onSuccessCallback,
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterUnlockDoorCommand(seqNum, mEndpoint, pin);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR DoorLockCluster::UnlockWithTimeout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                              uint16_t timeoutInSeconds, chip::ByteSpan pin)
+CHIP_ERROR DoorLockCluster::UnlockWithTimeout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t timeoutInSeconds, chip::ByteSpan pin)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kUnlockWithTimeoutCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2462,8 +2274,7 @@ CHIP_ERROR DoorLockCluster::UnlockWithTimeout(Callback::Cancelable * onSuccessCa
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterUnlockWithTimeoutCommand(seqNum, mEndpoint, timeoutInSeconds, pin);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterUnlockWithTimeoutCommand(seqNum, mEndpoint, timeoutInSeconds, pin);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
@@ -2471,25 +2282,21 @@ CHIP_ERROR DoorLockCluster::UnlockWithTimeout(Callback::Cancelable * onSuccessCa
 // DoorLock Cluster Attributes
 CHIP_ERROR DoorLockCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR DoorLockCluster::ReadAttributeLockState(Callback::Cancelable * onSuccessCallback,
-                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR DoorLockCluster::ReadAttributeLockState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterReadLockStateAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR DoorLockCluster::ConfigureAttributeLockState(Callback::Cancelable * onSuccessCallback,
-                                                        Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                        uint16_t maxInterval)
+CHIP_ERROR DoorLockCluster::ConfigureAttributeLockState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeDoorLockClusterConfigureLockStateAttribute(seqNum, mEndpoint, minInterval, maxInterval);
+    System::PacketBufferHandle encodedCommand = encodeDoorLockClusterConfigureLockStateAttribute(seqNum, mEndpoint, minInterval, maxInterval);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -2498,45 +2305,41 @@ CHIP_ERROR DoorLockCluster::ReportAttributeLockState(Callback::Cancelable * onRe
     return RequestAttributeReporting(0x0000, onReportCallback);
 }
 
-CHIP_ERROR DoorLockCluster::ReadAttributeLockType(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR DoorLockCluster::ReadAttributeLockType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterReadLockTypeAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR DoorLockCluster::ReadAttributeActuatorEnabled(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback)
+CHIP_ERROR DoorLockCluster::ReadAttributeActuatorEnabled(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterReadActuatorEnabledAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR DoorLockCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback)
+CHIP_ERROR DoorLockCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeDoorLockClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // GeneralCommissioning Cluster Commands
-CHIP_ERROR GeneralCommissioningCluster::ArmFailSafe(Callback::Cancelable * onSuccessCallback,
-                                                    Callback::Cancelable * onFailureCallback, uint16_t expiryLengthSeconds,
-                                                    uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR GeneralCommissioningCluster::ArmFailSafe(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kArmFailSafeCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2556,25 +2359,23 @@ CHIP_ERROR GeneralCommissioningCluster::ArmFailSafe(Callback::Cancelable * onSuc
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeGeneralCommissioningClusterArmFailSafeCommand(seqNum, mEndpoint, expiryLengthSeconds, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterArmFailSafeCommand(seqNum, mEndpoint, expiryLengthSeconds, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR GeneralCommissioningCluster::CommissioningComplete(Callback::Cancelable * onSuccessCallback,
-                                                              Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GeneralCommissioningCluster::CommissioningComplete(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kCommissioningCompleteCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2587,26 +2388,24 @@ CHIP_ERROR GeneralCommissioningCluster::CommissioningComplete(Callback::Cancelab
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterCommissioningCompleteCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR GeneralCommissioningCluster::SetFabric(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback, chip::ByteSpan fabricId,
-                                                  chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR GeneralCommissioningCluster::SetFabric(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSetFabricCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2628,99 +2427,90 @@ CHIP_ERROR GeneralCommissioningCluster::SetFabric(Callback::Cancelable * onSucce
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeGeneralCommissioningClusterSetFabricCommand(seqNum, mEndpoint, fabricId, fabricSecret, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterSetFabricCommand(seqNum, mEndpoint, fabricId, fabricSecret, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
 // GeneralCommissioning Cluster Attributes
-CHIP_ERROR GeneralCommissioningCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GeneralCommissioningCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR GeneralCommissioningCluster::ReadAttributeFabricId(Callback::Cancelable * onSuccessCallback,
-                                                              Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GeneralCommissioningCluster::ReadAttributeFabricId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterReadFabricIdAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR GeneralCommissioningCluster::ReadAttributeBreadcrumb(Callback::Cancelable * onSuccessCallback,
-                                                                Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GeneralCommissioningCluster::ReadAttributeBreadcrumb(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterReadBreadcrumbAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR GeneralCommissioningCluster::WriteAttributeBreadcrumb(Callback::Cancelable * onSuccessCallback,
-                                                                 Callback::Cancelable * onFailureCallback, uint64_t value)
+CHIP_ERROR GeneralCommissioningCluster::WriteAttributeBreadcrumb(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterWriteBreadcrumbAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR GeneralCommissioningCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                                     Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GeneralCommissioningCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGeneralCommissioningClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // GroupKeyManagement Cluster Commands
 // GroupKeyManagement Cluster Attributes
-CHIP_ERROR GroupKeyManagementCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GroupKeyManagementCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupKeyManagementClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR GroupKeyManagementCluster::ReadAttributeGroups(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GroupKeyManagementCluster::ReadAttributeGroups(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupKeyManagementClusterReadGroupsAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR GroupKeyManagementCluster::ReadAttributeGroupKeys(Callback::Cancelable * onSuccessCallback,
-                                                             Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GroupKeyManagementCluster::ReadAttributeGroupKeys(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupKeyManagementClusterReadGroupKeysAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR GroupKeyManagementCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GroupKeyManagementCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupKeyManagementClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // Groups Cluster Commands
-CHIP_ERROR GroupsCluster::AddGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                   uint16_t groupId, chip::ByteSpan groupName)
+CHIP_ERROR GroupsCluster::AddGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, chip::ByteSpan groupName)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kAddGroupCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2737,25 +2527,24 @@ CHIP_ERROR GroupsCluster::AddGroup(Callback::Cancelable * onSuccessCallback, Cal
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupsClusterAddGroupCommand(seqNum, mEndpoint, groupId, groupName);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR GroupsCluster::AddGroupIfIdentifying(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                uint16_t groupId, chip::ByteSpan groupName)
+CHIP_ERROR GroupsCluster::AddGroupIfIdentifying(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, chip::ByteSpan groupName)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kAddGroupIfIdentifyingCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2773,25 +2562,23 @@ CHIP_ERROR GroupsCluster::AddGroupIfIdentifying(Callback::Cancelable * onSuccess
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeGroupsClusterAddGroupIfIdentifyingCommand(seqNum, mEndpoint, groupId, groupName);
+    System::PacketBufferHandle encodedCommand = encodeGroupsClusterAddGroupIfIdentifyingCommand(seqNum, mEndpoint, groupId, groupName);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR GroupsCluster::GetGroupMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                             uint8_t groupCount, uint16_t groupList)
+CHIP_ERROR GroupsCluster::GetGroupMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t groupCount, uint16_t groupList)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetGroupMembershipCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2809,8 +2596,7 @@ CHIP_ERROR GroupsCluster::GetGroupMembership(Callback::Cancelable * onSuccessCal
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeGroupsClusterGetGroupMembershipCommand(seqNum, mEndpoint, groupCount, groupList);
+    System::PacketBufferHandle encodedCommand = encodeGroupsClusterGetGroupMembershipCommand(seqNum, mEndpoint, groupCount, groupList);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
@@ -2820,13 +2606,13 @@ CHIP_ERROR GroupsCluster::RemoveAllGroups(Callback::Cancelable * onSuccessCallba
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kRemoveAllGroupsCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2839,25 +2625,24 @@ CHIP_ERROR GroupsCluster::RemoveAllGroups(Callback::Cancelable * onSuccessCallba
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupsClusterRemoveAllGroupsCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR GroupsCluster::RemoveGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                      uint16_t groupId)
+CHIP_ERROR GroupsCluster::RemoveGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kRemoveGroupCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2872,25 +2657,24 @@ CHIP_ERROR GroupsCluster::RemoveGroup(Callback::Cancelable * onSuccessCallback,
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupsClusterRemoveGroupCommand(seqNum, mEndpoint, groupId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR GroupsCluster::ViewGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint16_t groupId)
+CHIP_ERROR GroupsCluster::ViewGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kViewGroupCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -2905,7 +2689,7 @@ CHIP_ERROR GroupsCluster::ViewGroup(Callback::Cancelable * onSuccessCallback, Ca
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupsClusterViewGroupCommand(seqNum, mEndpoint, groupId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -2914,102 +2698,96 @@ CHIP_ERROR GroupsCluster::ViewGroup(Callback::Cancelable * onSuccessCallback, Ca
 // Groups Cluster Attributes
 CHIP_ERROR GroupsCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupsClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR GroupsCluster::ReadAttributeNameSupport(Callback::Cancelable * onSuccessCallback,
-                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GroupsCluster::ReadAttributeNameSupport(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupsClusterReadNameSupportAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR GroupsCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR GroupsCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeGroupsClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // IasZone Cluster Commands
 // IasZone Cluster Attributes
 CHIP_ERROR IasZoneCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR IasZoneCluster::ReadAttributeZoneState(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR IasZoneCluster::ReadAttributeZoneState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterReadZoneStateAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
 CHIP_ERROR IasZoneCluster::ReadAttributeZoneType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterReadZoneTypeAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR IasZoneCluster::ReadAttributeZoneStatus(Callback::Cancelable * onSuccessCallback,
-                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR IasZoneCluster::ReadAttributeZoneStatus(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterReadZoneStatusAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR IasZoneCluster::ReadAttributeIasCieAddress(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR IasZoneCluster::ReadAttributeIasCieAddress(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterReadIasCieAddressAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR IasZoneCluster::WriteAttributeIasCieAddress(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback, uint64_t value)
+CHIP_ERROR IasZoneCluster::WriteAttributeIasCieAddress(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterWriteIasCieAddressAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
 CHIP_ERROR IasZoneCluster::ReadAttributeZoneId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterReadZoneIdAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR IasZoneCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                        Callback::Cancelable * onFailureCallback)
+CHIP_ERROR IasZoneCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIasZoneClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // Identify Cluster Commands
-CHIP_ERROR IdentifyCluster::Identify(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     uint16_t identifyTime)
+CHIP_ERROR IdentifyCluster::Identify(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t identifyTime)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kIdentifyCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3024,7 +2802,7 @@ CHIP_ERROR IdentifyCluster::Identify(Callback::Cancelable * onSuccessCallback, C
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIdentifyClusterIdentifyCommand(seqNum, mEndpoint, identifyTime);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -3035,13 +2813,13 @@ CHIP_ERROR IdentifyCluster::IdentifyQuery(Callback::Cancelable * onSuccessCallba
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kIdentifyQueryCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3054,7 +2832,7 @@ CHIP_ERROR IdentifyCluster::IdentifyQuery(Callback::Cancelable * onSuccessCallba
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIdentifyClusterIdentifyQueryCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -3063,48 +2841,45 @@ CHIP_ERROR IdentifyCluster::IdentifyQuery(Callback::Cancelable * onSuccessCallba
 // Identify Cluster Attributes
 CHIP_ERROR IdentifyCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIdentifyClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR IdentifyCluster::ReadAttributeIdentifyTime(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR IdentifyCluster::ReadAttributeIdentifyTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIdentifyClusterReadIdentifyTimeAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR IdentifyCluster::WriteAttributeIdentifyTime(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback, uint16_t value)
+CHIP_ERROR IdentifyCluster::WriteAttributeIdentifyTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIdentifyClusterWriteIdentifyTimeAttribute(seqNum, mEndpoint, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR IdentifyCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback)
+CHIP_ERROR IdentifyCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeIdentifyClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // LevelControl Cluster Commands
-CHIP_ERROR LevelControlCluster::Move(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride)
+CHIP_ERROR LevelControlCluster::Move(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3126,25 +2901,23 @@ CHIP_ERROR LevelControlCluster::Move(Callback::Cancelable * onSuccessCallback, C
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeLevelControlClusterMoveCommand(seqNum, mEndpoint, moveMode, rate, optionMask, optionOverride);
+    System::PacketBufferHandle encodedCommand = encodeLevelControlClusterMoveCommand(seqNum, mEndpoint, moveMode, rate, optionMask, optionOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR LevelControlCluster::MoveToLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                            uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
+CHIP_ERROR LevelControlCluster::MoveToLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveToLevelCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3166,26 +2939,23 @@ CHIP_ERROR LevelControlCluster::MoveToLevel(Callback::Cancelable * onSuccessCall
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeLevelControlClusterMoveToLevelCommand(seqNum, mEndpoint, level, transitionTime, optionMask, optionOverride);
+    System::PacketBufferHandle encodedCommand = encodeLevelControlClusterMoveToLevelCommand(seqNum, mEndpoint, level, transitionTime, optionMask, optionOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR LevelControlCluster::MoveToLevelWithOnOff(Callback::Cancelable * onSuccessCallback,
-                                                     Callback::Cancelable * onFailureCallback, uint8_t level,
-                                                     uint16_t transitionTime)
+CHIP_ERROR LevelControlCluster::MoveToLevelWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t level, uint16_t transitionTime)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveToLevelWithOnOffCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3203,25 +2973,23 @@ CHIP_ERROR LevelControlCluster::MoveToLevelWithOnOff(Callback::Cancelable * onSu
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeLevelControlClusterMoveToLevelWithOnOffCommand(seqNum, mEndpoint, level, transitionTime);
+    System::PacketBufferHandle encodedCommand = encodeLevelControlClusterMoveToLevelWithOnOffCommand(seqNum, mEndpoint, level, transitionTime);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR LevelControlCluster::MoveWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                              uint8_t moveMode, uint8_t rate)
+CHIP_ERROR LevelControlCluster::MoveWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kMoveWithOnOffCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3238,26 +3006,24 @@ CHIP_ERROR LevelControlCluster::MoveWithOnOff(Callback::Cancelable * onSuccessCa
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLevelControlClusterMoveWithOnOffCommand(seqNum, mEndpoint, moveMode, rate);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR LevelControlCluster::Step(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask,
-                                     uint8_t optionOverride)
+CHIP_ERROR LevelControlCluster::Step(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStepCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3281,25 +3047,23 @@ CHIP_ERROR LevelControlCluster::Step(Callback::Cancelable * onSuccessCallback, C
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeLevelControlClusterStepCommand(seqNum, mEndpoint, stepMode, stepSize, transitionTime, optionMask, optionOverride);
+    System::PacketBufferHandle encodedCommand = encodeLevelControlClusterStepCommand(seqNum, mEndpoint, stepMode, stepSize, transitionTime, optionMask, optionOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR LevelControlCluster::StepWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                              uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime)
+CHIP_ERROR LevelControlCluster::StepWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStepWithOnOffCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3319,25 +3083,23 @@ CHIP_ERROR LevelControlCluster::StepWithOnOff(Callback::Cancelable * onSuccessCa
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeLevelControlClusterStepWithOnOffCommand(seqNum, mEndpoint, stepMode, stepSize, transitionTime);
+    System::PacketBufferHandle encodedCommand = encodeLevelControlClusterStepWithOnOffCommand(seqNum, mEndpoint, stepMode, stepSize, transitionTime);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR LevelControlCluster::Stop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     uint8_t optionMask, uint8_t optionOverride)
+CHIP_ERROR LevelControlCluster::Stop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t optionMask, uint8_t optionOverride)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStopCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3354,7 +3116,7 @@ CHIP_ERROR LevelControlCluster::Stop(Callback::Cancelable * onSuccessCallback, C
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLevelControlClusterStopCommand(seqNum, mEndpoint, optionMask, optionOverride);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -3365,13 +3127,13 @@ CHIP_ERROR LevelControlCluster::StopWithOnOff(Callback::Cancelable * onSuccessCa
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStopWithOnOffCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3384,35 +3146,30 @@ CHIP_ERROR LevelControlCluster::StopWithOnOff(Callback::Cancelable * onSuccessCa
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLevelControlClusterStopWithOnOffCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
 // LevelControl Cluster Attributes
-CHIP_ERROR LevelControlCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR LevelControlCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLevelControlClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR LevelControlCluster::ReadAttributeCurrentLevel(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback)
+CHIP_ERROR LevelControlCluster::ReadAttributeCurrentLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLevelControlClusterReadCurrentLevelAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR LevelControlCluster::ConfigureAttributeCurrentLevel(Callback::Cancelable * onSuccessCallback,
-                                                               Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                               uint16_t maxInterval, uint8_t change)
+CHIP_ERROR LevelControlCluster::ConfigureAttributeCurrentLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint8_t change)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeLevelControlClusterConfigureCurrentLevelAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
+    System::PacketBufferHandle encodedCommand = encodeLevelControlClusterConfigureCurrentLevelAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -3421,27 +3178,27 @@ CHIP_ERROR LevelControlCluster::ReportAttributeCurrentLevel(Callback::Cancelable
     return RequestAttributeReporting(0x0000, onReportCallback);
 }
 
-CHIP_ERROR LevelControlCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                             Callback::Cancelable * onFailureCallback)
+CHIP_ERROR LevelControlCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLevelControlClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // LowPower Cluster Commands
 CHIP_ERROR LowPowerCluster::Sleep(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kSleepCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3454,7 +3211,7 @@ CHIP_ERROR LowPowerCluster::Sleep(Callback::Cancelable * onSuccessCallback, Call
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLowPowerClusterSleepCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -3463,33 +3220,31 @@ CHIP_ERROR LowPowerCluster::Sleep(Callback::Cancelable * onSuccessCallback, Call
 // LowPower Cluster Attributes
 CHIP_ERROR LowPowerCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLowPowerClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR LowPowerCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback)
+CHIP_ERROR LowPowerCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeLowPowerClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // NetworkCommissioning Cluster Commands
-CHIP_ERROR NetworkCommissioningCluster::AddThreadNetwork(Callback::Cancelable * onSuccessCallback,
-                                                         Callback::Cancelable * onFailureCallback,
-                                                         chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::AddThreadNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kAddThreadNetworkCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3509,26 +3264,23 @@ CHIP_ERROR NetworkCommissioningCluster::AddThreadNetwork(Callback::Cancelable *
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterAddThreadNetworkCommand(seqNum, mEndpoint, operationalDataset, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterAddThreadNetworkCommand(seqNum, mEndpoint, operationalDataset, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::AddWiFiNetwork(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid,
-                                                       chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::AddWiFiNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kAddWiFiNetworkCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3550,26 +3302,23 @@ CHIP_ERROR NetworkCommissioningCluster::AddWiFiNetwork(Callback::Cancelable * on
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterAddWiFiNetworkCommand(seqNum, mEndpoint, ssid, credentials, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterAddWiFiNetworkCommand(seqNum, mEndpoint, ssid, credentials, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::DisableNetwork(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID,
-                                                       uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::DisableNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kDisableNetworkCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3589,26 +3338,23 @@ CHIP_ERROR NetworkCommissioningCluster::DisableNetwork(Callback::Cancelable * on
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterDisableNetworkCommand(seqNum, mEndpoint, networkID, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterDisableNetworkCommand(seqNum, mEndpoint, networkID, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::EnableNetwork(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID,
-                                                      uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::EnableNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kEnableNetworkCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3628,26 +3374,23 @@ CHIP_ERROR NetworkCommissioningCluster::EnableNetwork(Callback::Cancelable * onS
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterEnableNetworkCommand(seqNum, mEndpoint, networkID, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterEnableNetworkCommand(seqNum, mEndpoint, networkID, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::GetLastNetworkCommissioningResult(Callback::Cancelable * onSuccessCallback,
-                                                                          Callback::Cancelable * onFailureCallback,
-                                                                          uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::GetLastNetworkCommissioningResult(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetLastNetworkCommissioningResultCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3663,26 +3406,23 @@ CHIP_ERROR NetworkCommissioningCluster::GetLastNetworkCommissioningResult(Callba
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterGetLastNetworkCommissioningResultCommand(seqNum, mEndpoint, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterGetLastNetworkCommissioningResultCommand(seqNum, mEndpoint, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::RemoveNetwork(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID,
-                                                      uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::RemoveNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kRemoveNetworkCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3702,26 +3442,23 @@ CHIP_ERROR NetworkCommissioningCluster::RemoveNetwork(Callback::Cancelable * onS
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterRemoveNetworkCommand(seqNum, mEndpoint, networkID, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterRemoveNetworkCommand(seqNum, mEndpoint, networkID, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::ScanNetworks(Callback::Cancelable * onSuccessCallback,
-                                                     Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid,
-                                                     uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::ScanNetworks(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kScanNetworksCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3741,27 +3478,23 @@ CHIP_ERROR NetworkCommissioningCluster::ScanNetworks(Callback::Cancelable * onSu
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterScanNetworksCommand(seqNum, mEndpoint, ssid, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterScanNetworksCommand(seqNum, mEndpoint, ssid, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::UpdateThreadNetwork(Callback::Cancelable * onSuccessCallback,
-                                                            Callback::Cancelable * onFailureCallback,
-                                                            chip::ByteSpan operationalDataset, uint64_t breadcrumb,
-                                                            uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::UpdateThreadNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kUpdateThreadNetworkCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3781,26 +3514,23 @@ CHIP_ERROR NetworkCommissioningCluster::UpdateThreadNetwork(Callback::Cancelable
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterUpdateThreadNetworkCommand(seqNum, mEndpoint, operationalDataset, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterUpdateThreadNetworkCommand(seqNum, mEndpoint, operationalDataset, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR NetworkCommissioningCluster::UpdateWiFiNetwork(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid,
-                                                          chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR NetworkCommissioningCluster::UpdateWiFiNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kUpdateWiFiNetworkCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3822,41 +3552,39 @@ CHIP_ERROR NetworkCommissioningCluster::UpdateWiFiNetwork(Callback::Cancelable *
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeNetworkCommissioningClusterUpdateWiFiNetworkCommand(seqNum, mEndpoint, ssid, credentials, breadcrumb, timeoutMs);
+    System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterUpdateWiFiNetworkCommand(seqNum, mEndpoint, ssid, credentials, breadcrumb, timeoutMs);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
 // NetworkCommissioning Cluster Attributes
-CHIP_ERROR NetworkCommissioningCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback)
+CHIP_ERROR NetworkCommissioningCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR NetworkCommissioningCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                                     Callback::Cancelable * onFailureCallback)
+CHIP_ERROR NetworkCommissioningCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeNetworkCommissioningClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // OnOff Cluster Commands
 CHIP_ERROR OnOffCluster::Off(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kOffCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3869,7 +3597,7 @@ CHIP_ERROR OnOffCluster::Off(Callback::Cancelable * onSuccessCallback, Callback:
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeOnOffClusterOffCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -3880,13 +3608,13 @@ CHIP_ERROR OnOffCluster::On(Callback::Cancelable * onSuccessCallback, Callback::
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kOnCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3899,7 +3627,7 @@ CHIP_ERROR OnOffCluster::On(Callback::Cancelable * onSuccessCallback, Callback::
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeOnOffClusterOnCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -3910,13 +3638,13 @@ CHIP_ERROR OnOffCluster::Toggle(Callback::Cancelable * onSuccessCallback, Callba
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kToggleCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -3929,7 +3657,7 @@ CHIP_ERROR OnOffCluster::Toggle(Callback::Cancelable * onSuccessCallback, Callba
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeOnOffClusterToggleCommand(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -3938,23 +3666,21 @@ CHIP_ERROR OnOffCluster::Toggle(Callback::Cancelable * onSuccessCallback, Callba
 // OnOff Cluster Attributes
 CHIP_ERROR OnOffCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeOnOffClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 CHIP_ERROR OnOffCluster::ReadAttributeOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeOnOffClusterReadOnOffAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR OnOffCluster::ConfigureAttributeOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 uint16_t minInterval, uint16_t maxInterval)
+CHIP_ERROR OnOffCluster::ConfigureAttributeOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeOnOffClusterConfigureOnOffAttribute(seqNum, mEndpoint, minInterval, maxInterval);
+    System::PacketBufferHandle encodedCommand = encodeOnOffClusterConfigureOnOffAttribute(seqNum, mEndpoint, minInterval, maxInterval);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -3963,29 +3689,27 @@ CHIP_ERROR OnOffCluster::ReportAttributeOnOff(Callback::Cancelable * onReportCal
     return RequestAttributeReporting(0x0000, onReportCallback);
 }
 
-CHIP_ERROR OnOffCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                      Callback::Cancelable * onFailureCallback)
+CHIP_ERROR OnOffCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeOnOffClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // Scenes Cluster Commands
-CHIP_ERROR ScenesCluster::AddScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                   uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::ByteSpan sceneName,
-                                   chip::ClusterId clusterId, uint8_t length, uint8_t value)
+CHIP_ERROR ScenesCluster::AddScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::ByteSpan sceneName, chip::ClusterId clusterId, uint8_t length, uint8_t value)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kAddSceneCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -4012,26 +3736,24 @@ CHIP_ERROR ScenesCluster::AddScene(Callback::Cancelable * onSuccessCallback, Cal
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand = encodeScenesClusterAddSceneCommand(
-        seqNum, mEndpoint, groupId, sceneId, transitionTime, sceneName, clusterId, length, value);
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
+    System::PacketBufferHandle encodedCommand = encodeScenesClusterAddSceneCommand(seqNum, mEndpoint, groupId, sceneId, transitionTime, sceneName, clusterId, length, value);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ScenesCluster::GetSceneMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                             uint16_t groupId)
+CHIP_ERROR ScenesCluster::GetSceneMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kGetSceneMembershipCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -4046,25 +3768,24 @@ CHIP_ERROR ScenesCluster::GetSceneMembership(Callback::Cancelable * onSuccessCal
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterGetSceneMembershipCommand(seqNum, mEndpoint, groupId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ScenesCluster::RecallScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                      uint16_t groupId, uint8_t sceneId, uint16_t transitionTime)
+CHIP_ERROR ScenesCluster::RecallScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kRecallSceneCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -4084,25 +3805,23 @@ CHIP_ERROR ScenesCluster::RecallScene(Callback::Cancelable * onSuccessCallback,
     return mDevice->SendCommands();
 #else
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeScenesClusterRecallSceneCommand(seqNum, mEndpoint, groupId, sceneId, transitionTime);
+    System::PacketBufferHandle encodedCommand = encodeScenesClusterRecallSceneCommand(seqNum, mEndpoint, groupId, sceneId, transitionTime);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ScenesCluster::RemoveAllScenes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t groupId)
+CHIP_ERROR ScenesCluster::RemoveAllScenes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kRemoveAllScenesCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -4117,25 +3836,24 @@ CHIP_ERROR ScenesCluster::RemoveAllScenes(Callback::Cancelable * onSuccessCallba
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterRemoveAllScenesCommand(seqNum, mEndpoint, groupId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ScenesCluster::RemoveScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                      uint16_t groupId, uint8_t sceneId)
+CHIP_ERROR ScenesCluster::RemoveScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kRemoveSceneCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -4152,25 +3870,24 @@ CHIP_ERROR ScenesCluster::RemoveScene(Callback::Cancelable * onSuccessCallback,
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterRemoveSceneCommand(seqNum, mEndpoint, groupId, sceneId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ScenesCluster::StoreScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     uint16_t groupId, uint8_t sceneId)
+CHIP_ERROR ScenesCluster::StoreScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kStoreSceneCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -4187,25 +3904,24 @@ CHIP_ERROR ScenesCluster::StoreScene(Callback::Cancelable * onSuccessCallback, C
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterStoreSceneCommand(seqNum, mEndpoint, groupId, sceneId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
 }
 
-CHIP_ERROR ScenesCluster::ViewScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint16_t groupId, uint8_t sceneId)
+CHIP_ERROR ScenesCluster::ViewScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId)
 {
 #if CHIP_ENABLE_INTERACTION_MODEL
     VerifyOrReturnError(mDevice != nullptr, CHIP_ERROR_INCORRECT_STATE);
     (void) onSuccessCallback;
-    (void) onFailureCallback;
+(void) onFailureCallback;
 
     app::Command::CommandParams cmdParams = { mEndpoint, /* group id */ 0, mClusterId, kViewSceneCommandId,
-                                              (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
-    app::Command * ZCLcommand             = mDevice->GetCommandSender();
+                                         (chip::app::Command::CommandPathFlags::kEndpointIdValid) };
+    app::Command * ZCLcommand = mDevice->GetCommandSender();
 
-    TLV::TLVWriter writer = ZCLcommand->CreateCommandDataElementTLVWriter();
+    TLV::TLVWriter writer  = ZCLcommand->CreateCommandDataElementTLVWriter();
 
     TLV::TLVType dummyType = TLV::kTLVType_NotSpecified;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag, TLV::kTLVType_Structure, dummyType));
@@ -4222,7 +3938,7 @@ CHIP_ERROR ScenesCluster::ViewScene(Callback::Cancelable * onSuccessCallback, Ca
 
     return mDevice->SendCommands();
 #else
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterViewSceneCommand(seqNum, mEndpoint, groupId, sceneId);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 #endif
@@ -4231,83 +3947,72 @@ CHIP_ERROR ScenesCluster::ViewScene(Callback::Cancelable * onSuccessCallback, Ca
 // Scenes Cluster Attributes
 CHIP_ERROR ScenesCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR ScenesCluster::ReadAttributeSceneCount(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ScenesCluster::ReadAttributeSceneCount(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterReadSceneCountAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ScenesCluster::ReadAttributeCurrentScene(Callback::Cancelable * onSuccessCallback,
-                                                    Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ScenesCluster::ReadAttributeCurrentScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterReadCurrentSceneAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ScenesCluster::ReadAttributeCurrentGroup(Callback::Cancelable * onSuccessCallback,
-                                                    Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ScenesCluster::ReadAttributeCurrentGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterReadCurrentGroupAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ScenesCluster::ReadAttributeSceneValid(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ScenesCluster::ReadAttributeSceneValid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterReadSceneValidAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ScenesCluster::ReadAttributeNameSupport(Callback::Cancelable * onSuccessCallback,
-                                                   Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ScenesCluster::ReadAttributeNameSupport(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterReadNameSupportAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR ScenesCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR ScenesCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeScenesClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 // TemperatureMeasurement Cluster Commands
 // TemperatureMeasurement Cluster Attributes
-CHIP_ERROR TemperatureMeasurementCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback,
-                                                             Callback::Cancelable * onFailureCallback)
+CHIP_ERROR TemperatureMeasurementCluster::DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeTemperatureMeasurementClusterDiscoverAttributes(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
-CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeMeasuredValue(Callback::Cancelable * onSuccessCallback,
-                                                                     Callback::Cancelable * onFailureCallback)
+CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeTemperatureMeasurementClusterReadMeasuredValueAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR TemperatureMeasurementCluster::ConfigureAttributeMeasuredValue(Callback::Cancelable * onSuccessCallback,
-                                                                          Callback::Cancelable * onFailureCallback,
-                                                                          uint16_t minInterval, uint16_t maxInterval,
-                                                                          int16_t change)
+CHIP_ERROR TemperatureMeasurementCluster::ConfigureAttributeMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, int16_t change)
 {
     uint8_t seqNum = mDevice->GetNextSequenceNumber();
-    System::PacketBufferHandle encodedCommand =
-        encodeTemperatureMeasurementClusterConfigureMeasuredValueAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
+    System::PacketBufferHandle encodedCommand = encodeTemperatureMeasurementClusterConfigureMeasuredValueAttribute(seqNum, mEndpoint, minInterval, maxInterval, change);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
@@ -4316,29 +4021,27 @@ CHIP_ERROR TemperatureMeasurementCluster::ReportAttributeMeasuredValue(Callback:
     return RequestAttributeReporting(0x0000, onReportCallback);
 }
 
-CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeMinMeasuredValue(Callback::Cancelable * onSuccessCallback,
-                                                                        Callback::Cancelable * onFailureCallback)
+CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeMinMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeTemperatureMeasurementClusterReadMinMeasuredValueAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeMaxMeasuredValue(Callback::Cancelable * onSuccessCallback,
-                                                                        Callback::Cancelable * onFailureCallback)
+CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeMaxMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeTemperatureMeasurementClusterReadMaxMeasuredValueAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
-CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback,
-                                                                       Callback::Cancelable * onFailureCallback)
+CHIP_ERROR TemperatureMeasurementCluster::ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback)
 {
-    uint8_t seqNum                            = mDevice->GetNextSequenceNumber();
+    uint8_t seqNum = mDevice->GetNextSequenceNumber();
     System::PacketBufferHandle encodedCommand = encodeTemperatureMeasurementClusterReadClusterRevisionAttribute(seqNum, mEndpoint);
     return SendCommand(seqNum, std::move(encodedCommand), onSuccessCallback, onFailureCallback);
 }
 
+
 } // namespace Controller
 } // namespace chip
diff --git a/src/controller/CHIPClusters.h b/src/controller/CHIPClusters.h
index 4d8841a8c05f8d..c76a74ccdfd2a3 100644
--- a/src/controller/CHIPClusters.h
+++ b/src/controller/CHIPClusters.h
@@ -27,22 +27,22 @@
 namespace chip {
 namespace Controller {
 
-constexpr ClusterId kApplicationBasicClusterId       = 0x050D;
-constexpr ClusterId kBarrierControlClusterId         = 0x0103;
-constexpr ClusterId kBasicClusterId                  = 0x0028;
-constexpr ClusterId kBindingClusterId                = 0xF000;
-constexpr ClusterId kColorControlClusterId           = 0x0300;
-constexpr ClusterId kDoorLockClusterId               = 0x0101;
-constexpr ClusterId kGeneralCommissioningClusterId   = 0x0030;
-constexpr ClusterId kGroupKeyManagementClusterId     = 0xF004;
-constexpr ClusterId kGroupsClusterId                 = 0x0004;
-constexpr ClusterId kIasZoneClusterId                = 0x0500;
-constexpr ClusterId kIdentifyClusterId               = 0x0003;
-constexpr ClusterId kLevelControlClusterId           = 0x0008;
-constexpr ClusterId kLowPowerClusterId               = 0x0508;
-constexpr ClusterId kNetworkCommissioningClusterId   = 0x0031;
-constexpr ClusterId kOnOffClusterId                  = 0x0006;
-constexpr ClusterId kScenesClusterId                 = 0x0005;
+constexpr ClusterId kApplicationBasicClusterId = 0x050D;
+constexpr ClusterId kBarrierControlClusterId = 0x0103;
+constexpr ClusterId kBasicClusterId = 0x0028;
+constexpr ClusterId kBindingClusterId = 0xF000;
+constexpr ClusterId kColorControlClusterId = 0x0300;
+constexpr ClusterId kDoorLockClusterId = 0x0101;
+constexpr ClusterId kGeneralCommissioningClusterId = 0x0030;
+constexpr ClusterId kGroupKeyManagementClusterId = 0xF004;
+constexpr ClusterId kGroupsClusterId = 0x0004;
+constexpr ClusterId kIasZoneClusterId = 0x0500;
+constexpr ClusterId kIdentifyClusterId = 0x0003;
+constexpr ClusterId kLevelControlClusterId = 0x0008;
+constexpr ClusterId kLowPowerClusterId = 0x0508;
+constexpr ClusterId kNetworkCommissioningClusterId = 0x0031;
+constexpr ClusterId kOnOffClusterId = 0x0006;
+constexpr ClusterId kScenesClusterId = 0x0005;
 constexpr ClusterId kTemperatureMeasurementClusterId = 0x0402;
 
 class DLL_EXPORT ApplicationBasicCluster : public ClusterBase
@@ -70,8 +70,7 @@ class DLL_EXPORT BarrierControlCluster : public ClusterBase
     ~BarrierControlCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR BarrierControlGoToPercent(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                         uint8_t percentOpen);
+    CHIP_ERROR BarrierControlGoToPercent(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t percentOpen);
     CHIP_ERROR BarrierControlStop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
 
     // Cluster Attributes
@@ -84,7 +83,7 @@ class DLL_EXPORT BarrierControlCluster : public ClusterBase
 
 private:
     static constexpr CommandId kBarrierControlGoToPercentCommandId = 0x00;
-    static constexpr CommandId kBarrierControlStopCommandId        = 0x01;
+    static constexpr CommandId kBarrierControlStopCommandId = 0x01;
 };
 
 class DLL_EXPORT BasicCluster : public ClusterBase
@@ -98,8 +97,7 @@ class DLL_EXPORT BasicCluster : public ClusterBase
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeInteractionModelVersion(Callback::Cancelable * onSuccessCallback,
-                                                    Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeInteractionModelVersion(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeVendorName(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeVendorID(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeProductName(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
@@ -107,16 +105,12 @@ class DLL_EXPORT BasicCluster : public ClusterBase
     CHIP_ERROR ReadAttributeUserLabel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeLocation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeHardwareVersion(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeHardwareVersionString(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeHardwareVersionString(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeSoftwareVersion(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeSoftwareVersionString(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeSoftwareVersionString(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR WriteAttributeUserLabel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                       chip::ByteSpan value);
-    CHIP_ERROR WriteAttributeLocation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                      chip::ByteSpan value);
+    CHIP_ERROR WriteAttributeUserLabel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan value);
+    CHIP_ERROR WriteAttributeLocation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan value);
 
 private:
     static constexpr CommandId kMfgSpecificPingCommandId = 0x00;
@@ -129,17 +123,15 @@ class DLL_EXPORT BindingCluster : public ClusterBase
     ~BindingCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR Bind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::NodeId nodeId,
-                    chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
-    CHIP_ERROR Unbind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::NodeId nodeId,
-                      chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
+    CHIP_ERROR Bind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
+    CHIP_ERROR Unbind(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId);
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
 
 private:
-    static constexpr CommandId kBindCommandId   = 0x00;
+    static constexpr CommandId kBindCommandId = 0x00;
     static constexpr CommandId kUnbindCommandId = 0x01;
 };
 
@@ -150,38 +142,20 @@ class DLL_EXPORT ColorControlCluster : public ClusterBase
     ~ColorControlCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR MoveColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, int16_t rateX,
-                         int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR MoveColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum,
-                                    uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR MoveHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode,
-                       uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR MoveSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode,
-                              uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR MoveToColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t colorX,
-                           uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR MoveToColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                      uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask,
-                                      uint8_t optionsOverride);
-    CHIP_ERROR MoveToHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t hue,
-                         uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR MoveToHueAndSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                      uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask,
-                                      uint8_t optionsOverride);
-    CHIP_ERROR MoveToSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR StepColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, int16_t stepX,
-                         int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR StepColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum,
-                                    uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR StepHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode,
-                       uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR StepSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode,
-                              uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
-    CHIP_ERROR StopMoveStep(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t optionsMask,
-                            uint8_t optionsOverride);
+    CHIP_ERROR MoveColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveToColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveToColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveToHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveToHueAndSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR MoveToSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR StepColor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR StepColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR StepHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR StepSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride);
+    CHIP_ERROR StopMoveStep(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t optionsMask, uint8_t optionsOverride);
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
@@ -218,90 +192,63 @@ class DLL_EXPORT ColorControlCluster : public ClusterBase
     CHIP_ERROR ReadAttributeWhitePointY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorPointRX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorPointRY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback,
-                                                 Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorPointGX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorPointGY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback,
-                                                 Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorPointBX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorPointBY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback,
-                                                 Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeEnhancedCurrentHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeEnhancedColorMode(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorLoopActive(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorLoopDirection(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorLoopTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeColorCapabilities(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeColorTempPhysicalMin(Callback::Cancelable * onSuccessCallback,
-                                                 Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeColorTempPhysicalMax(Callback::Cancelable * onSuccessCallback,
-                                                 Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeCoupleColorTempToLevelMinMireds(Callback::Cancelable * onSuccessCallback,
-                                                            Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ReadAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback,
-                                                          Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeColorTempPhysicalMin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeColorTempPhysicalMax(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeCoupleColorTempToLevelMinMireds(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
+    CHIP_ERROR ReadAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR WriteAttributeColorControlOptions(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 uint8_t value);
-    CHIP_ERROR WriteAttributeWhitePointX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                         uint16_t value);
-    CHIP_ERROR WriteAttributeWhitePointY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                         uint16_t value);
-    CHIP_ERROR WriteAttributeColorPointRX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t value);
-    CHIP_ERROR WriteAttributeColorPointRY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t value);
-    CHIP_ERROR WriteAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback, uint8_t value);
-    CHIP_ERROR WriteAttributeColorPointGX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t value);
-    CHIP_ERROR WriteAttributeColorPointGY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t value);
-    CHIP_ERROR WriteAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback, uint8_t value);
-    CHIP_ERROR WriteAttributeColorPointBX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t value);
-    CHIP_ERROR WriteAttributeColorPointBY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t value);
-    CHIP_ERROR WriteAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback, uint8_t value);
-    CHIP_ERROR WriteAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback,
-                                                           Callback::Cancelable * onFailureCallback, uint16_t value);
-    CHIP_ERROR ConfigureAttributeCurrentHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                            uint16_t minInterval, uint16_t maxInterval, uint8_t change);
+    CHIP_ERROR WriteAttributeColorControlOptions(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value);
+    CHIP_ERROR WriteAttributeWhitePointX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeWhitePointY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeColorPointRX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeColorPointRY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeColorPointRIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value);
+    CHIP_ERROR WriteAttributeColorPointGX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeColorPointGY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeColorPointGIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value);
+    CHIP_ERROR WriteAttributeColorPointBX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeColorPointBY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR WriteAttributeColorPointBIntensity(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t value);
+    CHIP_ERROR WriteAttributeStartUpColorTemperatureMireds(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
+    CHIP_ERROR ConfigureAttributeCurrentHue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint8_t change);
     CHIP_ERROR ReportAttributeCurrentHue(Callback::Cancelable * onReportCallback);
-    CHIP_ERROR ConfigureAttributeCurrentSaturation(Callback::Cancelable * onSuccessCallback,
-                                                   Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                   uint16_t maxInterval, uint8_t change);
+    CHIP_ERROR ConfigureAttributeCurrentSaturation(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint8_t change);
     CHIP_ERROR ReportAttributeCurrentSaturation(Callback::Cancelable * onReportCallback);
-    CHIP_ERROR ConfigureAttributeCurrentX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t minInterval, uint16_t maxInterval, uint16_t change);
+    CHIP_ERROR ConfigureAttributeCurrentX(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint16_t change);
     CHIP_ERROR ReportAttributeCurrentX(Callback::Cancelable * onReportCallback);
-    CHIP_ERROR ConfigureAttributeCurrentY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t minInterval, uint16_t maxInterval, uint16_t change);
+    CHIP_ERROR ConfigureAttributeCurrentY(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint16_t change);
     CHIP_ERROR ReportAttributeCurrentY(Callback::Cancelable * onReportCallback);
-    CHIP_ERROR ConfigureAttributeColorTemperature(Callback::Cancelable * onSuccessCallback,
-                                                  Callback::Cancelable * onFailureCallback, uint16_t minInterval,
-                                                  uint16_t maxInterval, uint16_t change);
+    CHIP_ERROR ConfigureAttributeColorTemperature(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint16_t change);
     CHIP_ERROR ReportAttributeColorTemperature(Callback::Cancelable * onReportCallback);
 
 private:
-    static constexpr CommandId kMoveColorCommandId              = 0x08;
-    static constexpr CommandId kMoveColorTemperatureCommandId   = 0x4B;
-    static constexpr CommandId kMoveHueCommandId                = 0x01;
-    static constexpr CommandId kMoveSaturationCommandId         = 0x04;
-    static constexpr CommandId kMoveToColorCommandId            = 0x07;
+    static constexpr CommandId kMoveColorCommandId = 0x08;
+    static constexpr CommandId kMoveColorTemperatureCommandId = 0x4B;
+    static constexpr CommandId kMoveHueCommandId = 0x01;
+    static constexpr CommandId kMoveSaturationCommandId = 0x04;
+    static constexpr CommandId kMoveToColorCommandId = 0x07;
     static constexpr CommandId kMoveToColorTemperatureCommandId = 0x0A;
-    static constexpr CommandId kMoveToHueCommandId              = 0x00;
+    static constexpr CommandId kMoveToHueCommandId = 0x00;
     static constexpr CommandId kMoveToHueAndSaturationCommandId = 0x06;
-    static constexpr CommandId kMoveToSaturationCommandId       = 0x03;
-    static constexpr CommandId kStepColorCommandId              = 0x09;
-    static constexpr CommandId kStepColorTemperatureCommandId   = 0x4C;
-    static constexpr CommandId kStepHueCommandId                = 0x02;
-    static constexpr CommandId kStepSaturationCommandId         = 0x05;
-    static constexpr CommandId kStopMoveStepCommandId           = 0x47;
+    static constexpr CommandId kMoveToSaturationCommandId = 0x03;
+    static constexpr CommandId kStepColorCommandId = 0x09;
+    static constexpr CommandId kStepColorTemperatureCommandId = 0x4C;
+    static constexpr CommandId kStepHueCommandId = 0x02;
+    static constexpr CommandId kStepSaturationCommandId = 0x05;
+    static constexpr CommandId kStopMoveStepCommandId = 0x47;
 };
 
 class DLL_EXPORT DoorLockCluster : public ClusterBase
@@ -313,42 +260,27 @@ class DLL_EXPORT DoorLockCluster : public ClusterBase
     // Cluster Commands
     CHIP_ERROR ClearAllPins(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ClearAllRfids(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ClearHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint8_t scheduleId);
+    CHIP_ERROR ClearHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId);
     CHIP_ERROR ClearPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId);
     CHIP_ERROR ClearRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId);
-    CHIP_ERROR ClearWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint8_t scheduleId, uint16_t userId);
-    CHIP_ERROR ClearYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint8_t scheduleId, uint16_t userId);
-    CHIP_ERROR GetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint8_t scheduleId);
+    CHIP_ERROR ClearWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId);
+    CHIP_ERROR ClearYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId);
+    CHIP_ERROR GetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId);
     CHIP_ERROR GetLogRecord(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t logIndex);
     CHIP_ERROR GetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId);
     CHIP_ERROR GetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId);
     CHIP_ERROR GetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId);
-    CHIP_ERROR GetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint8_t scheduleId, uint16_t userId);
-    CHIP_ERROR GetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint8_t scheduleId, uint16_t userId);
+    CHIP_ERROR GetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId);
+    CHIP_ERROR GetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId);
     CHIP_ERROR LockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan pin);
-    CHIP_ERROR SetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime,
-                                  uint8_t operatingModeDuringHoliday);
-    CHIP_ERROR SetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId,
-                      uint8_t userStatus, uint8_t userType, chip::ByteSpan pin);
-    CHIP_ERROR SetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId,
-                       uint8_t userStatus, uint8_t userType, chip::ByteSpan id);
-    CHIP_ERROR SetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId,
-                           uint8_t userType);
-    CHIP_ERROR SetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute,
-                                  uint8_t endHour, uint8_t endMinute);
-    CHIP_ERROR SetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime);
+    CHIP_ERROR SetHolidaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
+    CHIP_ERROR SetPin(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin);
+    CHIP_ERROR SetRfid(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan id);
+    CHIP_ERROR SetUserType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t userId, uint8_t userType);
+    CHIP_ERROR SetWeekdaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+    CHIP_ERROR SetYeardaySchedule(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime);
     CHIP_ERROR UnlockDoor(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan pin);
-    CHIP_ERROR UnlockWithTimeout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                 uint16_t timeoutInSeconds, chip::ByteSpan pin);
+    CHIP_ERROR UnlockWithTimeout(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t timeoutInSeconds, chip::ByteSpan pin);
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
@@ -356,34 +288,33 @@ class DLL_EXPORT DoorLockCluster : public ClusterBase
     CHIP_ERROR ReadAttributeLockType(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeActuatorEnabled(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ConfigureAttributeLockState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                           uint16_t minInterval, uint16_t maxInterval);
+    CHIP_ERROR ConfigureAttributeLockState(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval);
     CHIP_ERROR ReportAttributeLockState(Callback::Cancelable * onReportCallback);
 
 private:
-    static constexpr CommandId kClearAllPinsCommandId         = 0x08;
-    static constexpr CommandId kClearAllRfidsCommandId        = 0x19;
+    static constexpr CommandId kClearAllPinsCommandId = 0x08;
+    static constexpr CommandId kClearAllRfidsCommandId = 0x19;
     static constexpr CommandId kClearHolidayScheduleCommandId = 0x13;
-    static constexpr CommandId kClearPinCommandId             = 0x07;
-    static constexpr CommandId kClearRfidCommandId            = 0x18;
+    static constexpr CommandId kClearPinCommandId = 0x07;
+    static constexpr CommandId kClearRfidCommandId = 0x18;
     static constexpr CommandId kClearWeekdayScheduleCommandId = 0x0D;
     static constexpr CommandId kClearYeardayScheduleCommandId = 0x10;
-    static constexpr CommandId kGetHolidayScheduleCommandId   = 0x12;
-    static constexpr CommandId kGetLogRecordCommandId         = 0x04;
-    static constexpr CommandId kGetPinCommandId               = 0x06;
-    static constexpr CommandId kGetRfidCommandId              = 0x17;
-    static constexpr CommandId kGetUserTypeCommandId          = 0x15;
-    static constexpr CommandId kGetWeekdayScheduleCommandId   = 0x0C;
-    static constexpr CommandId kGetYeardayScheduleCommandId   = 0x0F;
-    static constexpr CommandId kLockDoorCommandId             = 0x00;
-    static constexpr CommandId kSetHolidayScheduleCommandId   = 0x11;
-    static constexpr CommandId kSetPinCommandId               = 0x05;
-    static constexpr CommandId kSetRfidCommandId              = 0x16;
-    static constexpr CommandId kSetUserTypeCommandId          = 0x14;
-    static constexpr CommandId kSetWeekdayScheduleCommandId   = 0x0B;
-    static constexpr CommandId kSetYeardayScheduleCommandId   = 0x0E;
-    static constexpr CommandId kUnlockDoorCommandId           = 0x01;
-    static constexpr CommandId kUnlockWithTimeoutCommandId    = 0x03;
+    static constexpr CommandId kGetHolidayScheduleCommandId = 0x12;
+    static constexpr CommandId kGetLogRecordCommandId = 0x04;
+    static constexpr CommandId kGetPinCommandId = 0x06;
+    static constexpr CommandId kGetRfidCommandId = 0x17;
+    static constexpr CommandId kGetUserTypeCommandId = 0x15;
+    static constexpr CommandId kGetWeekdayScheduleCommandId = 0x0C;
+    static constexpr CommandId kGetYeardayScheduleCommandId = 0x0F;
+    static constexpr CommandId kLockDoorCommandId = 0x00;
+    static constexpr CommandId kSetHolidayScheduleCommandId = 0x11;
+    static constexpr CommandId kSetPinCommandId = 0x05;
+    static constexpr CommandId kSetRfidCommandId = 0x16;
+    static constexpr CommandId kSetUserTypeCommandId = 0x14;
+    static constexpr CommandId kSetWeekdayScheduleCommandId = 0x0B;
+    static constexpr CommandId kSetYeardayScheduleCommandId = 0x0E;
+    static constexpr CommandId kUnlockDoorCommandId = 0x01;
+    static constexpr CommandId kUnlockWithTimeoutCommandId = 0x03;
 };
 
 class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
@@ -393,24 +324,21 @@ class DLL_EXPORT GeneralCommissioningCluster : public ClusterBase
     ~GeneralCommissioningCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR ArmFailSafe(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                           uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR ArmFailSafe(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs);
     CHIP_ERROR CommissioningComplete(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR SetFabric(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                         chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR SetFabric(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan fabricId, chip::ByteSpan fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs);
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeFabricId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeBreadcrumb(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR WriteAttributeBreadcrumb(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                        uint64_t value);
+    CHIP_ERROR WriteAttributeBreadcrumb(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t value);
 
 private:
-    static constexpr CommandId kArmFailSafeCommandId           = 0x02;
+    static constexpr CommandId kArmFailSafeCommandId = 0x02;
     static constexpr CommandId kCommissioningCompleteCommandId = 0x06;
-    static constexpr CommandId kSetFabricCommandId             = 0x00;
+    static constexpr CommandId kSetFabricCommandId = 0x00;
 };
 
 class DLL_EXPORT GroupKeyManagementCluster : public ClusterBase
@@ -433,12 +361,9 @@ class DLL_EXPORT GroupsCluster : public ClusterBase
     ~GroupsCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR AddGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId,
-                        chip::ByteSpan groupName);
-    CHIP_ERROR AddGroupIfIdentifying(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                     uint16_t groupId, chip::ByteSpan groupName);
-    CHIP_ERROR GetGroupMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint8_t groupCount, uint16_t groupList);
+    CHIP_ERROR AddGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, chip::ByteSpan groupName);
+    CHIP_ERROR AddGroupIfIdentifying(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, chip::ByteSpan groupName);
+    CHIP_ERROR GetGroupMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t groupCount, uint16_t groupList);
     CHIP_ERROR RemoveAllGroups(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR RemoveGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId);
     CHIP_ERROR ViewGroup(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId);
@@ -449,12 +374,12 @@ class DLL_EXPORT GroupsCluster : public ClusterBase
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
 
 private:
-    static constexpr CommandId kAddGroupCommandId              = 0x00;
+    static constexpr CommandId kAddGroupCommandId = 0x00;
     static constexpr CommandId kAddGroupIfIdentifyingCommandId = 0x05;
-    static constexpr CommandId kGetGroupMembershipCommandId    = 0x02;
-    static constexpr CommandId kRemoveAllGroupsCommandId       = 0x04;
-    static constexpr CommandId kRemoveGroupCommandId           = 0x03;
-    static constexpr CommandId kViewGroupCommandId             = 0x01;
+    static constexpr CommandId kGetGroupMembershipCommandId = 0x02;
+    static constexpr CommandId kRemoveAllGroupsCommandId = 0x04;
+    static constexpr CommandId kRemoveGroupCommandId = 0x03;
+    static constexpr CommandId kViewGroupCommandId = 0x01;
 };
 
 class DLL_EXPORT IasZoneCluster : public ClusterBase
@@ -471,8 +396,7 @@ class DLL_EXPORT IasZoneCluster : public ClusterBase
     CHIP_ERROR ReadAttributeIasCieAddress(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeZoneId(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR WriteAttributeIasCieAddress(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                           uint64_t value);
+    CHIP_ERROR WriteAttributeIasCieAddress(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint64_t value);
 };
 
 class DLL_EXPORT IdentifyCluster : public ClusterBase
@@ -489,11 +413,10 @@ class DLL_EXPORT IdentifyCluster : public ClusterBase
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeIdentifyTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR WriteAttributeIdentifyTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                          uint16_t value);
+    CHIP_ERROR WriteAttributeIdentifyTime(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t value);
 
 private:
-    static constexpr CommandId kIdentifyCommandId      = 0x00;
+    static constexpr CommandId kIdentifyCommandId = 0x00;
     static constexpr CommandId kIdentifyQueryCommandId = 0x01;
 };
 
@@ -504,39 +427,31 @@ class DLL_EXPORT LevelControlCluster : public ClusterBase
     ~LevelControlCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR Move(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode,
-                    uint8_t rate, uint8_t optionMask, uint8_t optionOverride);
-    CHIP_ERROR MoveToLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t level,
-                           uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
-    CHIP_ERROR MoveToLevelWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                    uint8_t level, uint16_t transitionTime);
-    CHIP_ERROR MoveWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode,
-                             uint8_t rate);
-    CHIP_ERROR Step(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode,
-                    uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
-    CHIP_ERROR StepWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode,
-                             uint8_t stepSize, uint16_t transitionTime);
-    CHIP_ERROR Stop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t optionMask,
-                    uint8_t optionOverride);
+    CHIP_ERROR Move(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride);
+    CHIP_ERROR MoveToLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
+    CHIP_ERROR MoveToLevelWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t level, uint16_t transitionTime);
+    CHIP_ERROR MoveWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t moveMode, uint8_t rate);
+    CHIP_ERROR Step(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride);
+    CHIP_ERROR StepWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime);
+    CHIP_ERROR Stop(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint8_t optionMask, uint8_t optionOverride);
     CHIP_ERROR StopWithOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeCurrentLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ConfigureAttributeCurrentLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                              uint16_t minInterval, uint16_t maxInterval, uint8_t change);
+    CHIP_ERROR ConfigureAttributeCurrentLevel(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, uint8_t change);
     CHIP_ERROR ReportAttributeCurrentLevel(Callback::Cancelable * onReportCallback);
 
 private:
-    static constexpr CommandId kMoveCommandId                 = 0x01;
-    static constexpr CommandId kMoveToLevelCommandId          = 0x00;
+    static constexpr CommandId kMoveCommandId = 0x01;
+    static constexpr CommandId kMoveToLevelCommandId = 0x00;
     static constexpr CommandId kMoveToLevelWithOnOffCommandId = 0x04;
-    static constexpr CommandId kMoveWithOnOffCommandId        = 0x05;
-    static constexpr CommandId kStepCommandId                 = 0x02;
-    static constexpr CommandId kStepWithOnOffCommandId        = 0x06;
-    static constexpr CommandId kStopCommandId                 = 0x03;
-    static constexpr CommandId kStopWithOnOffCommandId        = 0x07;
+    static constexpr CommandId kMoveWithOnOffCommandId = 0x05;
+    static constexpr CommandId kStepCommandId = 0x02;
+    static constexpr CommandId kStepWithOnOffCommandId = 0x06;
+    static constexpr CommandId kStopCommandId = 0x03;
+    static constexpr CommandId kStopWithOnOffCommandId = 0x07;
 };
 
 class DLL_EXPORT LowPowerCluster : public ClusterBase
@@ -563,39 +478,30 @@ class DLL_EXPORT NetworkCommissioningCluster : public ClusterBase
     ~NetworkCommissioningCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR AddThreadNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
-    CHIP_ERROR AddWiFiNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                              chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
-    CHIP_ERROR DisableNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                              chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
-    CHIP_ERROR EnableNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                             chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
-    CHIP_ERROR GetLastNetworkCommissioningResult(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                                 uint32_t timeoutMs);
-    CHIP_ERROR RemoveNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                             chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
-    CHIP_ERROR ScanNetworks(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid,
-                            uint64_t breadcrumb, uint32_t timeoutMs);
-    CHIP_ERROR UpdateThreadNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                   chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
-    CHIP_ERROR UpdateWiFiNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                 chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR AddThreadNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR AddWiFiNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR DisableNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR EnableNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR GetLastNetworkCommissioningResult(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint32_t timeoutMs);
+    CHIP_ERROR RemoveNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR ScanNetworks(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR UpdateThreadNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan operationalDataset, uint64_t breadcrumb, uint32_t timeoutMs);
+    CHIP_ERROR UpdateWiFiNetwork(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, chip::ByteSpan ssid, chip::ByteSpan credentials, uint64_t breadcrumb, uint32_t timeoutMs);
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
 
 private:
-    static constexpr CommandId kAddThreadNetworkCommandId                  = 0x06;
-    static constexpr CommandId kAddWiFiNetworkCommandId                    = 0x02;
-    static constexpr CommandId kDisableNetworkCommandId                    = 0x0E;
-    static constexpr CommandId kEnableNetworkCommandId                     = 0x0C;
+    static constexpr CommandId kAddThreadNetworkCommandId = 0x06;
+    static constexpr CommandId kAddWiFiNetworkCommandId = 0x02;
+    static constexpr CommandId kDisableNetworkCommandId = 0x0E;
+    static constexpr CommandId kEnableNetworkCommandId = 0x0C;
     static constexpr CommandId kGetLastNetworkCommissioningResultCommandId = 0x10;
-    static constexpr CommandId kRemoveNetworkCommandId                     = 0x0A;
-    static constexpr CommandId kScanNetworksCommandId                      = 0x00;
-    static constexpr CommandId kUpdateThreadNetworkCommandId               = 0x08;
-    static constexpr CommandId kUpdateWiFiNetworkCommandId                 = 0x04;
+    static constexpr CommandId kRemoveNetworkCommandId = 0x0A;
+    static constexpr CommandId kScanNetworksCommandId = 0x00;
+    static constexpr CommandId kUpdateThreadNetworkCommandId = 0x08;
+    static constexpr CommandId kUpdateWiFiNetworkCommandId = 0x04;
 };
 
 class DLL_EXPORT OnOffCluster : public ClusterBase
@@ -613,13 +519,12 @@ class DLL_EXPORT OnOffCluster : public ClusterBase
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ConfigureAttributeOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                       uint16_t minInterval, uint16_t maxInterval);
+    CHIP_ERROR ConfigureAttributeOnOff(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval);
     CHIP_ERROR ReportAttributeOnOff(Callback::Cancelable * onReportCallback);
 
 private:
-    static constexpr CommandId kOffCommandId    = 0x00;
-    static constexpr CommandId kOnCommandId     = 0x01;
+    static constexpr CommandId kOffCommandId = 0x00;
+    static constexpr CommandId kOnCommandId = 0x01;
     static constexpr CommandId kToggleCommandId = 0x02;
 };
 
@@ -630,21 +535,13 @@ class DLL_EXPORT ScenesCluster : public ClusterBase
     ~ScenesCluster() {}
 
     // Cluster Commands
-    CHIP_ERROR AddScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId,
-                        uint8_t sceneId, uint16_t transitionTime, chip::ByteSpan sceneName, chip::ClusterId clusterId,
-                        uint8_t length, uint8_t value);
-    CHIP_ERROR GetSceneMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                  uint16_t groupId);
-    CHIP_ERROR RecallScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId,
-                           uint8_t sceneId, uint16_t transitionTime);
-    CHIP_ERROR RemoveAllScenes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                               uint16_t groupId);
-    CHIP_ERROR RemoveScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId,
-                           uint8_t sceneId);
-    CHIP_ERROR StoreScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId,
-                          uint8_t sceneId);
-    CHIP_ERROR ViewScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId,
-                         uint8_t sceneId);
+    CHIP_ERROR AddScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::ByteSpan sceneName, chip::ClusterId clusterId, uint8_t length, uint8_t value);
+    CHIP_ERROR GetSceneMembership(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId);
+    CHIP_ERROR RecallScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime);
+    CHIP_ERROR RemoveAllScenes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId);
+    CHIP_ERROR RemoveScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId);
+    CHIP_ERROR StoreScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId);
+    CHIP_ERROR ViewScene(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t groupId, uint8_t sceneId);
 
     // Cluster Attributes
     CHIP_ERROR DiscoverAttributes(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
@@ -656,13 +553,13 @@ class DLL_EXPORT ScenesCluster : public ClusterBase
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
 
 private:
-    static constexpr CommandId kAddSceneCommandId           = 0x00;
+    static constexpr CommandId kAddSceneCommandId = 0x00;
     static constexpr CommandId kGetSceneMembershipCommandId = 0x06;
-    static constexpr CommandId kRecallSceneCommandId        = 0x05;
-    static constexpr CommandId kRemoveAllScenesCommandId    = 0x03;
-    static constexpr CommandId kRemoveSceneCommandId        = 0x02;
-    static constexpr CommandId kStoreSceneCommandId         = 0x04;
-    static constexpr CommandId kViewSceneCommandId          = 0x01;
+    static constexpr CommandId kRecallSceneCommandId = 0x05;
+    static constexpr CommandId kRemoveAllScenesCommandId = 0x03;
+    static constexpr CommandId kRemoveSceneCommandId = 0x02;
+    static constexpr CommandId kStoreSceneCommandId = 0x04;
+    static constexpr CommandId kViewSceneCommandId = 0x01;
 };
 
 class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
@@ -677,8 +574,7 @@ class DLL_EXPORT TemperatureMeasurementCluster : public ClusterBase
     CHIP_ERROR ReadAttributeMinMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeMaxMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
     CHIP_ERROR ReadAttributeClusterRevision(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback);
-    CHIP_ERROR ConfigureAttributeMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback,
-                                               uint16_t minInterval, uint16_t maxInterval, int16_t change);
+    CHIP_ERROR ConfigureAttributeMeasuredValue(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, uint16_t minInterval, uint16_t maxInterval, int16_t change);
     CHIP_ERROR ReportAttributeMeasuredValue(Callback::Cancelable * onReportCallback);
 };
 
diff --git a/src/controller/python/chip/clusters/CHIPClusters.cpp b/src/controller/python/chip/clusters/CHIPClusters.cpp
index 95e52b4565c7e9..8d42ebe70ea6fa 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.cpp
+++ b/src/controller/python/chip/clusters/CHIPClusters.cpp
@@ -33,8 +33,8 @@ extern "C" {
 
 // Cluster ApplicationBasic
 
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_VendorName(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId)
+
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_VendorName(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -42,8 +42,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_VendorName(chip::Controller::
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeVendorName(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_VendorId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_VendorId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -51,8 +50,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_VendorId(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeVendorId(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationName(chip::Controller::Device * device,
-                                                                   chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationName(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -60,8 +58,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationName(chip::Control
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeApplicationName(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ProductId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                             chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ProductId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -69,8 +66,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ProductId(chip::Controller::D
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeProductId(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -78,8 +74,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationId(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeApplicationId(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_CatalogVendorId(chip::Controller::Device * device,
-                                                                   chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_CatalogVendorId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -87,8 +82,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_CatalogVendorId(chip::Control
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCatalogVendorId(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationSatus(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationSatus(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -96,8 +90,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ApplicationSatus(chip::Contro
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeApplicationSatus(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ClusterRevision(chip::Controller::Device * device,
-                                                                   chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ApplicationBasicCluster cluster;
@@ -109,18 +102,16 @@ CHIP_ERROR chip_ime_ReadAttribute_ApplicationBasic_ClusterRevision(chip::Control
 // End of Cluster ApplicationBasic
 // Cluster BarrierControl
 
-CHIP_ERROR chip_ime_AppendCommand_BarrierControl_BarrierControlGoToPercent(chip::Controller::Device * device,
-                                                                           chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                           uint8_t percentOpen)
+CHIP_ERROR chip_ime_AppendCommand_BarrierControl_BarrierControlGoToPercent(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t percentOpen)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BarrierControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.BarrierControlGoToPercent(nullptr, nullptr, percentOpen);
+    return cluster.BarrierControlGoToPercent(nullptr, nullptr, percentOpen
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_BarrierControl_BarrierControlStop(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_BarrierControl_BarrierControlStop(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BarrierControlCluster cluster;
@@ -129,8 +120,7 @@ CHIP_ERROR chip_ime_AppendCommand_BarrierControl_BarrierControlStop(chip::Contro
     return cluster.BarrierControlStop(nullptr, nullptr);
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierMovingState(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierMovingState(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BarrierControlCluster cluster;
@@ -138,8 +128,7 @@ CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierMovingState(chip::Contro
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeBarrierMovingState(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierSafetyStatus(chip::Controller::Device * device,
-                                                                     chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierSafetyStatus(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BarrierControlCluster cluster;
@@ -147,8 +136,7 @@ CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierSafetyStatus(chip::Contr
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeBarrierSafetyStatus(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierCapabilities(chip::Controller::Device * device,
-                                                                     chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierCapabilities(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BarrierControlCluster cluster;
@@ -156,8 +144,7 @@ CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierCapabilities(chip::Contr
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeBarrierCapabilities(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierPosition(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierPosition(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BarrierControlCluster cluster;
@@ -165,8 +152,7 @@ CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_BarrierPosition(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeBarrierPosition(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BarrierControlCluster cluster;
@@ -178,8 +164,7 @@ CHIP_ERROR chip_ime_ReadAttribute_BarrierControl_ClusterRevision(chip::Controlle
 // End of Cluster BarrierControl
 // Cluster Basic
 
-CHIP_ERROR chip_ime_AppendCommand_Basic_MfgSpecificPing(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_Basic_MfgSpecificPing(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -188,8 +173,7 @@ CHIP_ERROR chip_ime_AppendCommand_Basic_MfgSpecificPing(chip::Controller::Device
     return cluster.MfgSpecificPing(nullptr, nullptr);
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_Basic_InteractionModelVersion(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_InteractionModelVersion(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -197,8 +181,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_InteractionModelVersion(chip::Controller
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeInteractionModelVersion(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_VendorName(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                   chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_VendorName(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -206,8 +189,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_VendorName(chip::Controller::Device * de
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeVendorName(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_VendorID(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_VendorID(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -215,8 +197,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_VendorID(chip::Controller::Device * devi
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeVendorID(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_ProductName(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_ProductName(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -224,8 +205,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_ProductName(chip::Controller::Device * d
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeProductName(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_ProductID(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                  chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_ProductID(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -233,8 +213,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_ProductID(chip::Controller::Device * dev
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeProductID(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_UserLabel(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                  chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_UserLabel(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -242,8 +221,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_UserLabel(chip::Controller::Device * dev
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeUserLabel(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_Location(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_Location(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -251,8 +229,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_Location(chip::Controller::Device * devi
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeLocation(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_HardwareVersion(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_HardwareVersion(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -260,8 +237,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_HardwareVersion(chip::Controller::Device
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeHardwareVersion(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_HardwareVersionString(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_HardwareVersionString(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -269,8 +245,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_HardwareVersionString(chip::Controller::
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeHardwareVersionString(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_SoftwareVersion(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_SoftwareVersion(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -278,8 +253,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_SoftwareVersion(chip::Controller::Device
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeSoftwareVersion(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_SoftwareVersionString(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_SoftwareVersionString(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -287,8 +261,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_SoftwareVersionString(chip::Controller::
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeSoftwareVersionString(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Basic_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Basic_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BasicCluster cluster;
@@ -300,29 +273,32 @@ CHIP_ERROR chip_ime_ReadAttribute_Basic_ClusterRevision(chip::Controller::Device
 // End of Cluster Basic
 // Cluster Binding
 
-CHIP_ERROR chip_ime_AppendCommand_Binding_Bind(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                               chip::GroupId ZCLgroupId, chip::NodeId nodeId, chip::GroupId groupId,
-                                               chip::EndpointId endpointId, chip::ClusterId clusterId)
+CHIP_ERROR chip_ime_AppendCommand_Binding_Bind(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BindingCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.Bind(nullptr, nullptr, nodeId, groupId, endpointId, clusterId);
+    return cluster.Bind(nullptr, nullptr, nodeId
+    , groupId
+    , endpointId
+    , clusterId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Binding_Unbind(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                 chip::GroupId ZCLgroupId, chip::NodeId nodeId, chip::GroupId groupId,
-                                                 chip::EndpointId endpointId, chip::ClusterId clusterId)
+CHIP_ERROR chip_ime_AppendCommand_Binding_Unbind(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, chip::NodeId nodeId, chip::GroupId groupId, chip::EndpointId endpointId, chip::ClusterId clusterId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BindingCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.Unbind(nullptr, nullptr, nodeId, groupId, endpointId, clusterId);
+    return cluster.Unbind(nullptr, nullptr, nodeId
+    , groupId
+    , endpointId
+    , clusterId
+    );
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_Binding_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                          chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Binding_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::BindingCluster cluster;
@@ -334,156 +310,185 @@ CHIP_ERROR chip_ime_ReadAttribute_Binding_ClusterRevision(chip::Controller::Devi
 // End of Cluster Binding
 // Cluster ColorControl
 
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveColor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId, int16_t rateX, int16_t rateY,
-                                                         uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveColor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, int16_t rateX, int16_t rateY, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveColor(nullptr, nullptr, rateX, rateY, optionsMask, optionsOverride);
+    return cluster.MoveColor(nullptr, nullptr, rateX
+    , rateY
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveColorTemperature(
-    chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t moveMode, uint16_t rate,
-    uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveColorTemperature(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveColorTemperature(nullptr, nullptr, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum,
-                                        optionsMask, optionsOverride);
+    return cluster.MoveColorTemperature(nullptr, nullptr, moveMode
+    , rate
+    , colorTemperatureMinimum
+    , colorTemperatureMaximum
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                       chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate,
-                                                       uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveHue(nullptr, nullptr, moveMode, rate, optionsMask, optionsOverride);
+    return cluster.MoveHue(nullptr, nullptr, moveMode
+    , rate
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate,
-                                                              uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveSaturation(nullptr, nullptr, moveMode, rate, optionsMask, optionsOverride);
+    return cluster.MoveSaturation(nullptr, nullptr, moveMode
+    , rate
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToColor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId, uint16_t colorX, uint16_t colorY,
-                                                           uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToColor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t colorX, uint16_t colorY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveToColor(nullptr, nullptr, colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    return cluster.MoveToColor(nullptr, nullptr, colorX
+    , colorY
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToColorTemperature(chip::Controller::Device * device,
-                                                                      chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                      uint16_t colorTemperature, uint16_t transitionTime,
-                                                                      uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToColorTemperature(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t colorTemperature, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveToColorTemperature(nullptr, nullptr, colorTemperature, transitionTime, optionsMask, optionsOverride);
+    return cluster.MoveToColorTemperature(nullptr, nullptr, colorTemperature
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId, uint8_t hue, uint8_t direction,
-                                                         uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t hue, uint8_t direction, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveToHue(nullptr, nullptr, hue, direction, transitionTime, optionsMask, optionsOverride);
+    return cluster.MoveToHue(nullptr, nullptr, hue
+    , direction
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToHueAndSaturation(chip::Controller::Device * device,
-                                                                      chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                      uint8_t hue, uint8_t saturation, uint16_t transitionTime,
-                                                                      uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToHueAndSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t hue, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveToHueAndSaturation(nullptr, nullptr, hue, saturation, transitionTime, optionsMask, optionsOverride);
+    return cluster.MoveToHueAndSaturation(nullptr, nullptr, hue
+    , saturation
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId, uint8_t saturation,
-                                                                uint16_t transitionTime, uint8_t optionsMask,
-                                                                uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_MoveToSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveToSaturation(nullptr, nullptr, saturation, transitionTime, optionsMask, optionsOverride);
+    return cluster.MoveToSaturation(nullptr, nullptr, saturation
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepColor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId, int16_t stepX, int16_t stepY,
-                                                         uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepColor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, int16_t stepX, int16_t stepY, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.StepColor(nullptr, nullptr, stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    return cluster.StepColor(nullptr, nullptr, stepX
+    , stepY
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepColorTemperature(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                    uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime,
-                                                                    uint16_t colorTemperatureMinimum,
-                                                                    uint16_t colorTemperatureMaximum, uint8_t optionsMask,
-                                                                    uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepColorTemperature(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime, uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.StepColorTemperature(nullptr, nullptr, stepMode, stepSize, transitionTime, colorTemperatureMinimum,
-                                        colorTemperatureMaximum, optionsMask, optionsOverride);
+    return cluster.StepColorTemperature(nullptr, nullptr, stepMode
+    , stepSize
+    , transitionTime
+    , colorTemperatureMinimum
+    , colorTemperatureMaximum
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                       chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize,
-                                                       uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.StepHue(nullptr, nullptr, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    return cluster.StepHue(nullptr, nullptr, stepMode
+    , stepSize
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize,
-                                                              uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_StepSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.StepSaturation(nullptr, nullptr, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    return cluster.StepSaturation(nullptr, nullptr, stepMode
+    , stepSize
+    , transitionTime
+    , optionsMask
+    , optionsOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_ColorControl_StopMoveStep(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId, uint8_t optionsMask, uint8_t optionsOverride)
+CHIP_ERROR chip_ime_AppendCommand_ColorControl_StopMoveStep(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t optionsMask, uint8_t optionsOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.StopMoveStep(nullptr, nullptr, optionsMask, optionsOverride);
+    return cluster.StopMoveStep(nullptr, nullptr, optionsMask
+    , optionsOverride
+    );
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                          chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -491,8 +496,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentHue(chip::Controller::Devi
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCurrentHue(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentSaturation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -500,8 +504,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentSaturation(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCurrentSaturation(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_RemainingTime(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                             chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_RemainingTime(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -509,8 +512,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_RemainingTime(chip::Controller::D
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeRemainingTime(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -518,8 +520,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentX(chip::Controller::Device
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCurrentX(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -527,8 +528,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CurrentY(chip::Controller::Device
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCurrentY(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_DriftCompensation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_DriftCompensation(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -536,8 +536,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_DriftCompensation(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeDriftCompensation(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CompensationText(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CompensationText(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -545,8 +544,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CompensationText(chip::Controller
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCompensationText(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTemperature(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTemperature(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -554,8 +552,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTemperature(chip::Controller
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorTemperature(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorMode(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorMode(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -563,8 +560,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorMode(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorMode(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorControlOptions(chip::Controller::Device * device,
-                                                                   chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorControlOptions(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -572,8 +568,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorControlOptions(chip::Control
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorControlOptions(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_NumberOfPrimaries(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_NumberOfPrimaries(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -581,8 +576,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_NumberOfPrimaries(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeNumberOfPrimaries(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -590,8 +584,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1X(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary1X(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -599,8 +592,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1Y(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary1Y(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -608,8 +600,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary1Intensity(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary1Intensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -617,8 +608,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2X(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary2X(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -626,8 +616,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2Y(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary2Y(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -635,8 +624,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary2Intensity(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary2Intensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -644,8 +632,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3X(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary3X(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -653,8 +640,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3Y(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary3Y(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -662,8 +648,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary3Intensity(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary3Intensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -671,8 +656,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4X(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary4X(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -680,8 +664,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4Y(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary4Y(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -689,8 +672,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary4Intensity(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary4Intensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -698,8 +680,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5X(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary5X(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -707,8 +688,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5Y(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary5Y(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -716,8 +696,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary5Intensity(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary5Intensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6X(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -725,8 +704,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6X(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary6X(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6Y(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -734,8 +712,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6Y(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary6Y(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6Intensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -743,8 +720,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_Primary6Intensity(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributePrimary6Intensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_WhitePointX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_WhitePointX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -752,8 +728,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_WhitePointX(chip::Controller::Dev
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeWhitePointX(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_WhitePointY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_WhitePointY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -761,8 +736,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_WhitePointY(chip::Controller::Dev
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeWhitePointY(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -770,8 +744,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRX(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointRX(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -779,8 +752,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRY(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointRY(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRIntensity(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRIntensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -788,8 +760,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointRIntensity(chip::Contro
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointRIntensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -797,8 +768,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGX(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointGX(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -806,8 +776,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGY(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointGY(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGIntensity(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGIntensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -815,8 +784,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointGIntensity(chip::Contro
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointGIntensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBX(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -824,8 +792,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBX(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointBX(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBY(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -833,8 +800,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBY(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointBY(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBIntensity(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBIntensity(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -842,8 +808,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorPointBIntensity(chip::Contro
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorPointBIntensity(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_EnhancedCurrentHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                  chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_EnhancedCurrentHue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -851,8 +816,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_EnhancedCurrentHue(chip::Controll
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeEnhancedCurrentHue(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_EnhancedColorMode(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_EnhancedColorMode(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -860,8 +824,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_EnhancedColorMode(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeEnhancedColorMode(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopActive(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                               chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopActive(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -869,8 +832,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopActive(chip::Controller:
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorLoopActive(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopDirection(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                  chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopDirection(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -878,8 +840,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopDirection(chip::Controll
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorLoopDirection(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopTime(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                             chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopTime(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -887,8 +848,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorLoopTime(chip::Controller::D
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorLoopTime(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorCapabilities(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorCapabilities(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -896,8 +856,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorCapabilities(chip::Controlle
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorCapabilities(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTempPhysicalMin(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTempPhysicalMin(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -905,8 +864,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTempPhysicalMin(chip::Contro
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorTempPhysicalMin(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTempPhysicalMax(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTempPhysicalMax(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -914,9 +872,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ColorTempPhysicalMax(chip::Contro
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeColorTempPhysicalMax(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CoupleColorTempToLevelMinMireds(chip::Controller::Device * device,
-                                                                               chip::EndpointId ZCLendpointId,
-                                                                               chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CoupleColorTempToLevelMinMireds(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -924,9 +880,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_CoupleColorTempToLevelMinMireds(c
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCoupleColorTempToLevelMinMireds(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_StartUpColorTemperatureMireds(chip::Controller::Device * device,
-                                                                             chip::EndpointId ZCLendpointId,
-                                                                             chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_StartUpColorTemperatureMireds(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -934,8 +888,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_StartUpColorTemperatureMireds(chi
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeStartUpColorTemperatureMireds(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                               chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ColorControlCluster cluster;
@@ -947,8 +900,7 @@ CHIP_ERROR chip_ime_ReadAttribute_ColorControl_ClusterRevision(chip::Controller:
 // End of Cluster ColorControl
 // Cluster DoorLock
 
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearAllPins(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearAllPins(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
@@ -956,8 +908,7 @@ CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearAllPins(chip::Controller::Device
     cluster.Associate(device, ZCLendpointId);
     return cluster.ClearAllPins(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearAllRfids(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearAllRfids(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
@@ -965,205 +916,221 @@ CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearAllRfids(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.ClearAllRfids(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearHolidaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId, uint8_t scheduleId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearHolidaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ClearHolidaySchedule(nullptr, nullptr, scheduleId);
+    return cluster.ClearHolidaySchedule(nullptr, nullptr, scheduleId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearPin(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearPin(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ClearPin(nullptr, nullptr, userId);
+    return cluster.ClearPin(nullptr, nullptr, userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearRfid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearRfid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ClearRfid(nullptr, nullptr, userId);
+    return cluster.ClearRfid(nullptr, nullptr, userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearWeekdaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearWeekdaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ClearWeekdaySchedule(nullptr, nullptr, scheduleId, userId);
+    return cluster.ClearWeekdaySchedule(nullptr, nullptr, scheduleId
+    , userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearYeardaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_ClearYeardaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ClearYeardaySchedule(nullptr, nullptr, scheduleId, userId);
+    return cluster.ClearYeardaySchedule(nullptr, nullptr, scheduleId
+    , userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetHolidaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t scheduleId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetHolidaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetHolidaySchedule(nullptr, nullptr, scheduleId);
+    return cluster.GetHolidaySchedule(nullptr, nullptr, scheduleId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetLogRecord(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId, uint16_t logIndex)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetLogRecord(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t logIndex)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetLogRecord(nullptr, nullptr, logIndex);
+    return cluster.GetLogRecord(nullptr, nullptr, logIndex
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetPin(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                  chip::GroupId ZCLgroupId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetPin(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetPin(nullptr, nullptr, userId);
+    return cluster.GetPin(nullptr, nullptr, userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetRfid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                   chip::GroupId ZCLgroupId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetRfid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetRfid(nullptr, nullptr, userId);
+    return cluster.GetRfid(nullptr, nullptr, userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetUserType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                       chip::GroupId ZCLgroupId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetUserType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetUserType(nullptr, nullptr, userId);
+    return cluster.GetUserType(nullptr, nullptr, userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetWeekdaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetWeekdaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetWeekdaySchedule(nullptr, nullptr, scheduleId, userId);
+    return cluster.GetWeekdaySchedule(nullptr, nullptr, scheduleId
+    , userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetYeardaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_GetYeardaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetYeardaySchedule(nullptr, nullptr, scheduleId, userId);
+    return cluster.GetYeardaySchedule(nullptr, nullptr, scheduleId
+    , userId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_LockDoor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId, const uint8_t * pin, uint32_t pin_Len)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_LockDoor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * pin, uint32_t pin_Len)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.LockDoor(nullptr, nullptr, chip::ByteSpan(pin, pin_Len));
+    return cluster.LockDoor(nullptr, nullptr, chip::ByteSpan(pin, pin_Len)
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetHolidaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t scheduleId, uint32_t localStartTime,
-                                                              uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetHolidaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.SetHolidaySchedule(nullptr, nullptr, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+    return cluster.SetHolidaySchedule(nullptr, nullptr, scheduleId
+    , localStartTime
+    , localEndTime
+    , operatingModeDuringHoliday
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetPin(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                  chip::GroupId ZCLgroupId, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                  const uint8_t * pin, uint32_t pin_Len)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetPin(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId, uint8_t userStatus, uint8_t userType, const uint8_t * pin, uint32_t pin_Len)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.SetPin(nullptr, nullptr, userId, userStatus, userType, chip::ByteSpan(pin, pin_Len));
+    return cluster.SetPin(nullptr, nullptr, userId
+    , userStatus
+    , userType
+    , chip::ByteSpan(pin, pin_Len)
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetRfid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                   chip::GroupId ZCLgroupId, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                   const uint8_t * id, uint32_t id_Len)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetRfid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId, uint8_t userStatus, uint8_t userType, const uint8_t * id, uint32_t id_Len)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.SetRfid(nullptr, nullptr, userId, userStatus, userType, chip::ByteSpan(id, id_Len));
+    return cluster.SetRfid(nullptr, nullptr, userId
+    , userStatus
+    , userType
+    , chip::ByteSpan(id, id_Len)
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetUserType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                       chip::GroupId ZCLgroupId, uint16_t userId, uint8_t userType)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetUserType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t userId, uint8_t userType)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.SetUserType(nullptr, nullptr, userId, userType);
+    return cluster.SetUserType(nullptr, nullptr, userId
+    , userType
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetWeekdaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId,
-                                                              uint8_t daysMask, uint8_t startHour, uint8_t startMinute,
-                                                              uint8_t endHour, uint8_t endMinute)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetWeekdaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.SetWeekdaySchedule(nullptr, nullptr, scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+    return cluster.SetWeekdaySchedule(nullptr, nullptr, scheduleId
+    , userId
+    , daysMask
+    , startHour
+    , startMinute
+    , endHour
+    , endMinute
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetYeardaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                              chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId,
-                                                              uint32_t localStartTime, uint32_t localEndTime)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_SetYeardaySchedule(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.SetYeardaySchedule(nullptr, nullptr, scheduleId, userId, localStartTime, localEndTime);
+    return cluster.SetYeardaySchedule(nullptr, nullptr, scheduleId
+    , userId
+    , localStartTime
+    , localEndTime
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_UnlockDoor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                      chip::GroupId ZCLgroupId, const uint8_t * pin, uint32_t pin_Len)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_UnlockDoor(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * pin, uint32_t pin_Len)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.UnlockDoor(nullptr, nullptr, chip::ByteSpan(pin, pin_Len));
+    return cluster.UnlockDoor(nullptr, nullptr, chip::ByteSpan(pin, pin_Len)
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_DoorLock_UnlockWithTimeout(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                             chip::GroupId ZCLgroupId, uint16_t timeoutInSeconds,
-                                                             const uint8_t * pin, uint32_t pin_Len)
+CHIP_ERROR chip_ime_AppendCommand_DoorLock_UnlockWithTimeout(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t timeoutInSeconds, const uint8_t * pin, uint32_t pin_Len)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.UnlockWithTimeout(nullptr, nullptr, timeoutInSeconds, chip::ByteSpan(pin, pin_Len));
+    return cluster.UnlockWithTimeout(nullptr, nullptr, timeoutInSeconds
+    , chip::ByteSpan(pin, pin_Len)
+    );
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_DoorLock_LockState(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_DoorLock_LockState(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
@@ -1171,8 +1138,7 @@ CHIP_ERROR chip_ime_ReadAttribute_DoorLock_LockState(chip::Controller::Device *
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeLockState(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_DoorLock_LockType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_DoorLock_LockType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
@@ -1180,8 +1146,7 @@ CHIP_ERROR chip_ime_ReadAttribute_DoorLock_LockType(chip::Controller::Device * d
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeLockType(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_DoorLock_ActuatorEnabled(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_DoorLock_ActuatorEnabled(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
@@ -1189,8 +1154,7 @@ CHIP_ERROR chip_ime_ReadAttribute_DoorLock_ActuatorEnabled(chip::Controller::Dev
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeActuatorEnabled(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_DoorLock_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_DoorLock_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::DoorLockCluster cluster;
@@ -1202,20 +1166,18 @@ CHIP_ERROR chip_ime_ReadAttribute_DoorLock_ClusterRevision(chip::Controller::Dev
 // End of Cluster DoorLock
 // Cluster GeneralCommissioning
 
-CHIP_ERROR chip_ime_AppendCommand_GeneralCommissioning_ArmFailSafe(chip::Controller::Device * device,
-                                                                   chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                   uint16_t expiryLengthSeconds, uint64_t breadcrumb,
-                                                                   uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_GeneralCommissioning_ArmFailSafe(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GeneralCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ArmFailSafe(nullptr, nullptr, expiryLengthSeconds, breadcrumb, timeoutMs);
+    return cluster.ArmFailSafe(nullptr, nullptr, expiryLengthSeconds
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_GeneralCommissioning_CommissioningComplete(chip::Controller::Device * device,
-                                                                             chip::EndpointId ZCLendpointId,
-                                                                             chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_GeneralCommissioning_CommissioningComplete(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GeneralCommissioningCluster cluster;
@@ -1223,21 +1185,20 @@ CHIP_ERROR chip_ime_AppendCommand_GeneralCommissioning_CommissioningComplete(chi
     cluster.Associate(device, ZCLendpointId);
     return cluster.CommissioningComplete(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_AppendCommand_GeneralCommissioning_SetFabric(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                 chip::GroupId ZCLgroupId, const uint8_t * fabricId,
-                                                                 uint32_t fabricId_Len, const uint8_t * fabricSecret,
-                                                                 uint32_t fabricSecret_Len, uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_GeneralCommissioning_SetFabric(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * fabricId, uint32_t fabricId_Len, const uint8_t * fabricSecret, uint32_t fabricSecret_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GeneralCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.SetFabric(nullptr, nullptr, chip::ByteSpan(fabricId, fabricId_Len),
-                             chip::ByteSpan(fabricSecret, fabricSecret_Len), breadcrumb, timeoutMs);
+    return cluster.SetFabric(nullptr, nullptr, chip::ByteSpan(fabricId, fabricId_Len)
+    , chip::ByteSpan(fabricSecret, fabricSecret_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_FabricId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_FabricId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GeneralCommissioningCluster cluster;
@@ -1245,8 +1206,7 @@ CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_FabricId(chip::Controller
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeFabricId(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_Breadcrumb(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                                  chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_Breadcrumb(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GeneralCommissioningCluster cluster;
@@ -1254,8 +1214,7 @@ CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_Breadcrumb(chip::Controll
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeBreadcrumb(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_ClusterRevision(chip::Controller::Device * device,
-                                                                       chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GeneralCommissioningCluster cluster;
@@ -1267,8 +1226,8 @@ CHIP_ERROR chip_ime_ReadAttribute_GeneralCommissioning_ClusterRevision(chip::Con
 // End of Cluster GeneralCommissioning
 // Cluster GroupKeyManagement
 
-CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_Groups(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+
+CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_Groups(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupKeyManagementCluster cluster;
@@ -1276,8 +1235,7 @@ CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_Groups(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeGroups(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_GroupKeys(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                               chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_GroupKeys(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupKeyManagementCluster cluster;
@@ -1285,8 +1243,7 @@ CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_GroupKeys(chip::Controller:
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeGroupKeys(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_ClusterRevision(chip::Controller::Device * device,
-                                                                     chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupKeyManagementCluster cluster;
@@ -1298,37 +1255,37 @@ CHIP_ERROR chip_ime_ReadAttribute_GroupKeyManagement_ClusterRevision(chip::Contr
 // End of Cluster GroupKeyManagement
 // Cluster Groups
 
-CHIP_ERROR chip_ime_AppendCommand_Groups_AddGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                  chip::GroupId ZCLgroupId, uint16_t groupId, const uint8_t * groupName,
-                                                  uint32_t groupName_Len)
+CHIP_ERROR chip_ime_AppendCommand_Groups_AddGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId, const uint8_t * groupName, uint32_t groupName_Len)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.AddGroup(nullptr, nullptr, groupId, chip::ByteSpan(groupName, groupName_Len));
+    return cluster.AddGroup(nullptr, nullptr, groupId
+    , chip::ByteSpan(groupName, groupName_Len)
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Groups_AddGroupIfIdentifying(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                               chip::GroupId ZCLgroupId, uint16_t groupId,
-                                                               const uint8_t * groupName, uint32_t groupName_Len)
+CHIP_ERROR chip_ime_AppendCommand_Groups_AddGroupIfIdentifying(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId, const uint8_t * groupName, uint32_t groupName_Len)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.AddGroupIfIdentifying(nullptr, nullptr, groupId, chip::ByteSpan(groupName, groupName_Len));
+    return cluster.AddGroupIfIdentifying(nullptr, nullptr, groupId
+    , chip::ByteSpan(groupName, groupName_Len)
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Groups_GetGroupMembership(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId, uint8_t groupCount, uint16_t groupList)
+CHIP_ERROR chip_ime_AppendCommand_Groups_GetGroupMembership(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t groupCount, uint16_t groupList)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetGroupMembership(nullptr, nullptr, groupCount, groupList);
+    return cluster.GetGroupMembership(nullptr, nullptr, groupCount
+    , groupList
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Groups_RemoveAllGroups(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_Groups_RemoveAllGroups(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
@@ -1336,27 +1293,26 @@ CHIP_ERROR chip_ime_AppendCommand_Groups_RemoveAllGroups(chip::Controller::Devic
     cluster.Associate(device, ZCLendpointId);
     return cluster.RemoveAllGroups(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_AppendCommand_Groups_RemoveGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId, uint16_t groupId)
+CHIP_ERROR chip_ime_AppendCommand_Groups_RemoveGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.RemoveGroup(nullptr, nullptr, groupId);
+    return cluster.RemoveGroup(nullptr, nullptr, groupId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Groups_ViewGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                   chip::GroupId ZCLgroupId, uint16_t groupId)
+CHIP_ERROR chip_ime_AppendCommand_Groups_ViewGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ViewGroup(nullptr, nullptr, groupId);
+    return cluster.ViewGroup(nullptr, nullptr, groupId
+    );
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_Groups_NameSupport(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Groups_NameSupport(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
@@ -1364,8 +1320,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Groups_NameSupport(chip::Controller::Device *
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeNameSupport(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Groups_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Groups_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::GroupsCluster cluster;
@@ -1377,8 +1332,8 @@ CHIP_ERROR chip_ime_ReadAttribute_Groups_ClusterRevision(chip::Controller::Devic
 // End of Cluster Groups
 // Cluster IasZone
 
-CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneState(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId)
+
+CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneState(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IasZoneCluster cluster;
@@ -1386,8 +1341,7 @@ CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneState(chip::Controller::Device * d
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeZoneState(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                   chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneType(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IasZoneCluster cluster;
@@ -1395,8 +1349,7 @@ CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneType(chip::Controller::Device * de
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeZoneType(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneStatus(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneStatus(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IasZoneCluster cluster;
@@ -1404,8 +1357,7 @@ CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneStatus(chip::Controller::Device *
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeZoneStatus(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_IasZone_IasCieAddress(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_IasZone_IasCieAddress(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IasZoneCluster cluster;
@@ -1413,8 +1365,7 @@ CHIP_ERROR chip_ime_ReadAttribute_IasZone_IasCieAddress(chip::Controller::Device
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeIasCieAddress(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneId(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IasZoneCluster cluster;
@@ -1422,8 +1373,7 @@ CHIP_ERROR chip_ime_ReadAttribute_IasZone_ZoneId(chip::Controller::Device * devi
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeZoneId(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_IasZone_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                          chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_IasZone_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IasZoneCluster cluster;
@@ -1435,17 +1385,16 @@ CHIP_ERROR chip_ime_ReadAttribute_IasZone_ClusterRevision(chip::Controller::Devi
 // End of Cluster IasZone
 // Cluster Identify
 
-CHIP_ERROR chip_ime_AppendCommand_Identify_Identify(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId, uint16_t identifyTime)
+CHIP_ERROR chip_ime_AppendCommand_Identify_Identify(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t identifyTime)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IdentifyCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.Identify(nullptr, nullptr, identifyTime);
+    return cluster.Identify(nullptr, nullptr, identifyTime
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Identify_IdentifyQuery(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_Identify_IdentifyQuery(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IdentifyCluster cluster;
@@ -1454,8 +1403,7 @@ CHIP_ERROR chip_ime_AppendCommand_Identify_IdentifyQuery(chip::Controller::Devic
     return cluster.IdentifyQuery(nullptr, nullptr);
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_Identify_IdentifyTime(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Identify_IdentifyTime(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IdentifyCluster cluster;
@@ -1463,8 +1411,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Identify_IdentifyTime(chip::Controller::Device
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeIdentifyTime(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Identify_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Identify_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::IdentifyCluster cluster;
@@ -1476,76 +1423,85 @@ CHIP_ERROR chip_ime_ReadAttribute_Identify_ClusterRevision(chip::Controller::Dev
 // End of Cluster Identify
 // Cluster LevelControl
 
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_Move(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate, uint8_t optionMask,
-                                                    uint8_t optionOverride)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_Move(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate, uint8_t optionMask, uint8_t optionOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.Move(nullptr, nullptr, moveMode, rate, optionMask, optionOverride);
+    return cluster.Move(nullptr, nullptr, moveMode
+    , rate
+    , optionMask
+    , optionOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_MoveToLevel(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId, uint8_t level, uint16_t transitionTime,
-                                                           uint8_t optionMask, uint8_t optionOverride)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_MoveToLevel(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t level, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveToLevel(nullptr, nullptr, level, transitionTime, optionMask, optionOverride);
+    return cluster.MoveToLevel(nullptr, nullptr, level
+    , transitionTime
+    , optionMask
+    , optionOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_MoveToLevelWithOnOff(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                    uint8_t level, uint16_t transitionTime)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_MoveToLevelWithOnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t level, uint16_t transitionTime)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveToLevelWithOnOff(nullptr, nullptr, level, transitionTime);
+    return cluster.MoveToLevelWithOnOff(nullptr, nullptr, level
+    , transitionTime
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_MoveWithOnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                             chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_MoveWithOnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t moveMode, uint8_t rate)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.MoveWithOnOff(nullptr, nullptr, moveMode, rate);
+    return cluster.MoveWithOnOff(nullptr, nullptr, moveMode
+    , rate
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_Step(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize,
-                                                    uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_Step(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.Step(nullptr, nullptr, stepMode, stepSize, transitionTime, optionMask, optionOverride);
+    return cluster.Step(nullptr, nullptr, stepMode
+    , stepSize
+    , transitionTime
+    , optionMask
+    , optionOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_StepWithOnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                             chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize,
-                                                             uint16_t transitionTime)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_StepWithOnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.StepWithOnOff(nullptr, nullptr, stepMode, stepSize, transitionTime);
+    return cluster.StepWithOnOff(nullptr, nullptr, stepMode
+    , stepSize
+    , transitionTime
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_Stop(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId, uint8_t optionMask, uint8_t optionOverride)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_Stop(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint8_t optionMask, uint8_t optionOverride)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.Stop(nullptr, nullptr, optionMask, optionOverride);
+    return cluster.Stop(nullptr, nullptr, optionMask
+    , optionOverride
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_LevelControl_StopWithOnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                             chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_LevelControl_StopWithOnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
@@ -1554,8 +1510,7 @@ CHIP_ERROR chip_ime_AppendCommand_LevelControl_StopWithOnOff(chip::Controller::D
     return cluster.StopWithOnOff(nullptr, nullptr);
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_LevelControl_CurrentLevel(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_LevelControl_CurrentLevel(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
@@ -1563,8 +1518,7 @@ CHIP_ERROR chip_ime_ReadAttribute_LevelControl_CurrentLevel(chip::Controller::De
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCurrentLevel(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_LevelControl_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                               chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_LevelControl_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LevelControlCluster cluster;
@@ -1576,8 +1530,7 @@ CHIP_ERROR chip_ime_ReadAttribute_LevelControl_ClusterRevision(chip::Controller:
 // End of Cluster LevelControl
 // Cluster LowPower
 
-CHIP_ERROR chip_ime_AppendCommand_LowPower_Sleep(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                 chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_LowPower_Sleep(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LowPowerCluster cluster;
@@ -1586,8 +1539,7 @@ CHIP_ERROR chip_ime_AppendCommand_LowPower_Sleep(chip::Controller::Device * devi
     return cluster.Sleep(nullptr, nullptr);
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_LowPower_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                           chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_LowPower_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::LowPowerCluster cluster;
@@ -1599,116 +1551,107 @@ CHIP_ERROR chip_ime_ReadAttribute_LowPower_ClusterRevision(chip::Controller::Dev
 // End of Cluster LowPower
 // Cluster NetworkCommissioning
 
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_AddThreadNetwork(chip::Controller::Device * device,
-                                                                        chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                        const uint8_t * operationalDataset,
-                                                                        uint32_t operationalDataset_Len, uint64_t breadcrumb,
-                                                                        uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_AddThreadNetwork(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * operationalDataset, uint32_t operationalDataset_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.AddThreadNetwork(nullptr, nullptr, chip::ByteSpan(operationalDataset, operationalDataset_Len), breadcrumb,
-                                    timeoutMs);
+    return cluster.AddThreadNetwork(nullptr, nullptr, chip::ByteSpan(operationalDataset, operationalDataset_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_AddWiFiNetwork(chip::Controller::Device * device,
-                                                                      chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                      const uint8_t * ssid, uint32_t ssid_Len,
-                                                                      const uint8_t * credentials, uint32_t credentials_Len,
-                                                                      uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_AddWiFiNetwork(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * ssid, uint32_t ssid_Len, const uint8_t * credentials, uint32_t credentials_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.AddWiFiNetwork(nullptr, nullptr, chip::ByteSpan(ssid, ssid_Len), chip::ByteSpan(credentials, credentials_Len),
-                                  breadcrumb, timeoutMs);
+    return cluster.AddWiFiNetwork(nullptr, nullptr, chip::ByteSpan(ssid, ssid_Len)
+    , chip::ByteSpan(credentials, credentials_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_DisableNetwork(chip::Controller::Device * device,
-                                                                      chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                      const uint8_t * networkID, uint32_t networkID_Len,
-                                                                      uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_DisableNetwork(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * networkID, uint32_t networkID_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.DisableNetwork(nullptr, nullptr, chip::ByteSpan(networkID, networkID_Len), breadcrumb, timeoutMs);
+    return cluster.DisableNetwork(nullptr, nullptr, chip::ByteSpan(networkID, networkID_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_EnableNetwork(chip::Controller::Device * device,
-                                                                     chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                     const uint8_t * networkID, uint32_t networkID_Len,
-                                                                     uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_EnableNetwork(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * networkID, uint32_t networkID_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.EnableNetwork(nullptr, nullptr, chip::ByteSpan(networkID, networkID_Len), breadcrumb, timeoutMs);
+    return cluster.EnableNetwork(nullptr, nullptr, chip::ByteSpan(networkID, networkID_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_GetLastNetworkCommissioningResult(chip::Controller::Device * device,
-                                                                                         chip::EndpointId ZCLendpointId,
-                                                                                         chip::GroupId ZCLgroupId,
-                                                                                         uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_GetLastNetworkCommissioningResult(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetLastNetworkCommissioningResult(nullptr, nullptr, timeoutMs);
+    return cluster.GetLastNetworkCommissioningResult(nullptr, nullptr, timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_RemoveNetwork(chip::Controller::Device * device,
-                                                                     chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                     const uint8_t * networkID, uint32_t networkID_Len,
-                                                                     uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_RemoveNetwork(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * networkID, uint32_t networkID_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.RemoveNetwork(nullptr, nullptr, chip::ByteSpan(networkID, networkID_Len), breadcrumb, timeoutMs);
+    return cluster.RemoveNetwork(nullptr, nullptr, chip::ByteSpan(networkID, networkID_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_ScanNetworks(chip::Controller::Device * device,
-                                                                    chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                    const uint8_t * ssid, uint32_t ssid_Len, uint64_t breadcrumb,
-                                                                    uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_ScanNetworks(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * ssid, uint32_t ssid_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ScanNetworks(nullptr, nullptr, chip::ByteSpan(ssid, ssid_Len), breadcrumb, timeoutMs);
+    return cluster.ScanNetworks(nullptr, nullptr, chip::ByteSpan(ssid, ssid_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_UpdateThreadNetwork(chip::Controller::Device * device,
-                                                                           chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                           const uint8_t * operationalDataset,
-                                                                           uint32_t operationalDataset_Len, uint64_t breadcrumb,
-                                                                           uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_UpdateThreadNetwork(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * operationalDataset, uint32_t operationalDataset_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.UpdateThreadNetwork(nullptr, nullptr, chip::ByteSpan(operationalDataset, operationalDataset_Len), breadcrumb,
-                                       timeoutMs);
+    return cluster.UpdateThreadNetwork(nullptr, nullptr, chip::ByteSpan(operationalDataset, operationalDataset_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_UpdateWiFiNetwork(chip::Controller::Device * device,
-                                                                         chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId,
-                                                                         const uint8_t * ssid, uint32_t ssid_Len,
-                                                                         const uint8_t * credentials, uint32_t credentials_Len,
-                                                                         uint64_t breadcrumb, uint32_t timeoutMs)
+CHIP_ERROR chip_ime_AppendCommand_NetworkCommissioning_UpdateWiFiNetwork(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, const uint8_t * ssid, uint32_t ssid_Len, const uint8_t * credentials, uint32_t credentials_Len, uint64_t breadcrumb, uint32_t timeoutMs)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.UpdateWiFiNetwork(nullptr, nullptr, chip::ByteSpan(ssid, ssid_Len), chip::ByteSpan(credentials, credentials_Len),
-                                     breadcrumb, timeoutMs);
+    return cluster.UpdateWiFiNetwork(nullptr, nullptr, chip::ByteSpan(ssid, ssid_Len)
+    , chip::ByteSpan(credentials, credentials_Len)
+    , breadcrumb
+    , timeoutMs
+    );
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_NetworkCommissioning_ClusterRevision(chip::Controller::Device * device,
-                                                                       chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_NetworkCommissioning_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::NetworkCommissioningCluster cluster;
@@ -1720,8 +1663,7 @@ CHIP_ERROR chip_ime_ReadAttribute_NetworkCommissioning_ClusterRevision(chip::Con
 // End of Cluster NetworkCommissioning
 // Cluster OnOff
 
-CHIP_ERROR chip_ime_AppendCommand_OnOff_Off(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                            chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_OnOff_Off(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::OnOffCluster cluster;
@@ -1729,8 +1671,7 @@ CHIP_ERROR chip_ime_AppendCommand_OnOff_Off(chip::Controller::Device * device, c
     cluster.Associate(device, ZCLendpointId);
     return cluster.Off(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_AppendCommand_OnOff_On(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                           chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_OnOff_On(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::OnOffCluster cluster;
@@ -1738,8 +1679,7 @@ CHIP_ERROR chip_ime_AppendCommand_OnOff_On(chip::Controller::Device * device, ch
     cluster.Associate(device, ZCLendpointId);
     return cluster.On(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_AppendCommand_OnOff_Toggle(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                               chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_AppendCommand_OnOff_Toggle(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::OnOffCluster cluster;
@@ -1748,8 +1688,7 @@ CHIP_ERROR chip_ime_AppendCommand_OnOff_Toggle(chip::Controller::Device * device
     return cluster.Toggle(nullptr, nullptr);
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_OnOff_OnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                              chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_OnOff_OnOff(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::OnOffCluster cluster;
@@ -1757,8 +1696,7 @@ CHIP_ERROR chip_ime_ReadAttribute_OnOff_OnOff(chip::Controller::Device * device,
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeOnOff(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_OnOff_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                        chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_OnOff_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::OnOffCluster cluster;
@@ -1770,76 +1708,82 @@ CHIP_ERROR chip_ime_ReadAttribute_OnOff_ClusterRevision(chip::Controller::Device
 // End of Cluster OnOff
 // Cluster Scenes
 
-CHIP_ERROR chip_ime_AppendCommand_Scenes_AddScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                  chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId,
-                                                  uint16_t transitionTime, const uint8_t * sceneName, uint32_t sceneName_Len,
-                                                  chip::ClusterId clusterId, uint8_t length, uint8_t value)
+CHIP_ERROR chip_ime_AppendCommand_Scenes_AddScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, const uint8_t * sceneName, uint32_t sceneName_Len, chip::ClusterId clusterId, uint8_t length, uint8_t value)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.AddScene(nullptr, nullptr, groupId, sceneId, transitionTime, chip::ByteSpan(sceneName, sceneName_Len), clusterId,
-                            length, value);
+    return cluster.AddScene(nullptr, nullptr, groupId
+    , sceneId
+    , transitionTime
+    , chip::ByteSpan(sceneName, sceneName_Len)
+    , clusterId
+    , length
+    , value
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Scenes_GetSceneMembership(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                            chip::GroupId ZCLgroupId, uint16_t groupId)
+CHIP_ERROR chip_ime_AppendCommand_Scenes_GetSceneMembership(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.GetSceneMembership(nullptr, nullptr, groupId);
+    return cluster.GetSceneMembership(nullptr, nullptr, groupId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Scenes_RecallScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId,
-                                                     uint16_t transitionTime)
+CHIP_ERROR chip_ime_AppendCommand_Scenes_RecallScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.RecallScene(nullptr, nullptr, groupId, sceneId, transitionTime);
+    return cluster.RecallScene(nullptr, nullptr, groupId
+    , sceneId
+    , transitionTime
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Scenes_RemoveAllScenes(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId, uint16_t groupId)
+CHIP_ERROR chip_ime_AppendCommand_Scenes_RemoveAllScenes(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.RemoveAllScenes(nullptr, nullptr, groupId);
+    return cluster.RemoveAllScenes(nullptr, nullptr, groupId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Scenes_RemoveScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId)
+CHIP_ERROR chip_ime_AppendCommand_Scenes_RemoveScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.RemoveScene(nullptr, nullptr, groupId, sceneId);
+    return cluster.RemoveScene(nullptr, nullptr, groupId
+    , sceneId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Scenes_StoreScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId)
+CHIP_ERROR chip_ime_AppendCommand_Scenes_StoreScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.StoreScene(nullptr, nullptr, groupId, sceneId);
+    return cluster.StoreScene(nullptr, nullptr, groupId
+    , sceneId
+    );
 }
-CHIP_ERROR chip_ime_AppendCommand_Scenes_ViewScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                   chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId)
+CHIP_ERROR chip_ime_AppendCommand_Scenes_ViewScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId, uint16_t groupId, uint8_t sceneId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
     (void) ZCLgroupId;
     cluster.Associate(device, ZCLendpointId);
-    return cluster.ViewScene(nullptr, nullptr, groupId, sceneId);
+    return cluster.ViewScene(nullptr, nullptr, groupId
+    , sceneId
+    );
 }
 
-CHIP_ERROR chip_ime_ReadAttribute_Scenes_SceneCount(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Scenes_SceneCount(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
@@ -1847,8 +1791,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Scenes_SceneCount(chip::Controller::Device * d
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeSceneCount(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Scenes_CurrentScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                      chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Scenes_CurrentScene(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
@@ -1856,8 +1799,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Scenes_CurrentScene(chip::Controller::Device *
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCurrentScene(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Scenes_CurrentGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                      chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Scenes_CurrentGroup(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
@@ -1865,8 +1807,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Scenes_CurrentGroup(chip::Controller::Device *
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeCurrentGroup(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Scenes_SceneValid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                    chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Scenes_SceneValid(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
@@ -1874,8 +1815,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Scenes_SceneValid(chip::Controller::Device * d
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeSceneValid(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Scenes_NameSupport(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                     chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Scenes_NameSupport(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
@@ -1883,8 +1823,7 @@ CHIP_ERROR chip_ime_ReadAttribute_Scenes_NameSupport(chip::Controller::Device *
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeNameSupport(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_Scenes_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId,
-                                                         chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_Scenes_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::ScenesCluster cluster;
@@ -1896,8 +1835,8 @@ CHIP_ERROR chip_ime_ReadAttribute_Scenes_ClusterRevision(chip::Controller::Devic
 // End of Cluster Scenes
 // Cluster TemperatureMeasurement
 
-CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MeasuredValue(chip::Controller::Device * device,
-                                                                       chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+
+CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MeasuredValue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::TemperatureMeasurementCluster cluster;
@@ -1905,8 +1844,7 @@ CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MeasuredValue(chip::Con
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeMeasuredValue(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MinMeasuredValue(chip::Controller::Device * device,
-                                                                          chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MinMeasuredValue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::TemperatureMeasurementCluster cluster;
@@ -1914,8 +1852,7 @@ CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MinMeasuredValue(chip::
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeMinMeasuredValue(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MaxMeasuredValue(chip::Controller::Device * device,
-                                                                          chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MaxMeasuredValue(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::TemperatureMeasurementCluster cluster;
@@ -1923,8 +1860,7 @@ CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_MaxMeasuredValue(chip::
     cluster.Associate(device, ZCLendpointId);
     return cluster.ReadAttributeMaxMeasuredValue(nullptr, nullptr);
 }
-CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_ClusterRevision(chip::Controller::Device * device,
-                                                                         chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
+CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_ClusterRevision(chip::Controller::Device * device, chip::EndpointId ZCLendpointId, chip::GroupId ZCLgroupId)
 {
     VerifyOrReturnError(device != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     chip::Controller::TemperatureMeasurementCluster cluster;
@@ -1934,4 +1870,5 @@ CHIP_ERROR chip_ime_ReadAttribute_TemperatureMeasurement_ClusterRevision(chip::C
 }
 
 // End of Cluster TemperatureMeasurement
+
 }
diff --git a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp
index 2f78e0b4c1b817..e27971329c7c14 100644
--- a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp
+++ b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.cpp
@@ -20,10 +20,10 @@
 #include "gen/CHIPClientCallbacks.h"
 
 #include "gen/enums.h"
-#include <app/util/CHIPDeviceCallbacksMgr.h>
-#include <app/util/af-enums.h>
 #include <app/util/af.h>
+#include <app/util/af-enums.h>
 #include <app/util/basic-types.h>
+#include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <core/CHIPEncoding.h>
 #include <support/SafeInt.h>
 #include <support/logging/CHIPLogging.h>
@@ -212,14 +212,12 @@ bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, Em
     GET_RESPONSE_CALLBACKS("emberAfDefaultResponseCallback");
     if (status == EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultSuccessCallback> * cb =
-            Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+        Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
         cb->mCall(cb->mContext);
     }
     else
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, static_cast<uint8_t>(status));
     }
 
@@ -252,216 +250,203 @@ bool emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * messag
 
             switch (attributeType)
             {
-            case 0x00: // nodata / No data
-            case 0x0A: // data24 / 24-bit data
-            case 0x0C: // data40 / 40-bit data
-            case 0x0D: // data48 / 48-bit data
-            case 0x0E: // data56 / 56-bit data
-            case 0x1A: // map24 / 24-bit bitmap
-            case 0x1C: // map40 / 40-bit bitmap
-            case 0x1D: // map48 / 48-bit bitmap
-            case 0x1E: // map56 / 56-bit bitmap
-            case 0x22: // uint24 / Unsigned 24-bit integer
-            case 0x24: // uint40 / Unsigned 40-bit integer
-            case 0x25: // uint48 / Unsigned 48-bit integer
-            case 0x26: // uint56 / Unsigned 56-bit integer
-            case 0x2A: // int24 / Signed 24-bit integer
-            case 0x2C: // int40 / Signed 40-bit integer
-            case 0x2D: // int48 / Signed 48-bit integer
-            case 0x2E: // int56 / Signed 56-bit integer
-            case 0x38: // semi / Semi-precision
-            case 0x39: // single / Single precision
-            case 0x3A: // double / Double precision
-            case 0x48: // array / Array
-            case 0x49: // struct / Structure
-            case 0x50: // set / Set
-            case 0x51: // bag / Bag
-            case 0xE0: // ToD / Time of day
-            {
-                ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
-                Callback::Callback<DefaultFailureCallback> * cb =
-                    Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
-                cb->mCall(cb->mContext, EMBER_ZCL_STATUS_INVALID_VALUE);
-                return true;
-            }
-
-            case 0x41: // octstr / Octet string
-            case 0x42: // string / Character string
-            {
-                // Short Strings must contains at least one byte for the length
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t length = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-                // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
-                if (length == 0xFF)
+                case 0x00: // nodata / No data
+                case 0x0A: // data24 / 24-bit data
+                case 0x0C: // data40 / 40-bit data
+                case 0x0D: // data48 / 48-bit data
+                case 0x0E: // data56 / 56-bit data
+                case 0x1A: // map24 / 24-bit bitmap
+                case 0x1C: // map40 / 40-bit bitmap
+                case 0x1D: // map48 / 48-bit bitmap
+                case 0x1E: // map56 / 56-bit bitmap
+                case 0x22: // uint24 / Unsigned 24-bit integer
+                case 0x24: // uint40 / Unsigned 40-bit integer
+                case 0x25: // uint48 / Unsigned 48-bit integer
+                case 0x26: // uint56 / Unsigned 56-bit integer
+                case 0x2A: // int24 / Signed 24-bit integer
+                case 0x2C: // int40 / Signed 40-bit integer
+                case 0x2D: // int48 / Signed 48-bit integer
+                case 0x2E: // int56 / Signed 56-bit integer
+                case 0x38: // semi / Semi-precision
+                case 0x39: // single / Single precision
+                case 0x3A: // double / Double precision
+                case 0x48: // array / Array
+                case 0x49: // struct / Structure
+                case 0x50: // set / Set
+                case 0x51: // bag / Bag
+                case 0xE0: // ToD / Time of day
                 {
-                    length = 0;
+                    ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
+                    Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+                    cb->mCall(cb->mContext, EMBER_ZCL_STATUS_INVALID_VALUE);
+                    return true;
                 }
 
-                CHECK_MESSAGE_LENGTH(length);
-                Callback::Callback<StringAttributeCallback> * cb =
-                    Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-                break;
-            }
-
-            case 0x43: // octstr16 / Long octet string
-            case 0x44: // string16 / Long character string
-            {
-                // Long Strings must contains at least two bytes for the length
-                CHECK_MESSAGE_LENGTH(2);
-                uint16_t length = chip::Encoding::LittleEndian::Read16(message);
-                ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-                // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
-                if (length == 0xFFFF)
+                case 0x41: // octstr / Octet string
+                case 0x42: // string / Character string
                 {
-                    length = 0;
+                    // Short Strings must contains at least one byte for the length
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t length = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  length: 0x%02x", length);
+
+                    // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
+                    if (length == 0xFF)
+                    {
+                        length = 0;
+                    }
+
+                    CHECK_MESSAGE_LENGTH(length);
+                    Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                    break;
                 }
 
-                CHECK_MESSAGE_LENGTH(length);
-                Callback::Callback<StringAttributeCallback> * cb =
-                    Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-                break;
-            }
+                case 0x43: // octstr16 / Long octet string
+                case 0x44: // string16 / Long character string
+                {
+                    // Long Strings must contains at least two bytes for the length
+                    CHECK_MESSAGE_LENGTH(2);
+                    uint16_t length = chip::Encoding::LittleEndian::Read16(message);
+                    ChipLogProgress(Zcl, "  length: 0x%02x", length);
+
+                    // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
+                    if (length == 0xFFFF)
+                    {
+                        length = 0;
+                    }
+
+                    CHECK_MESSAGE_LENGTH(length);
+                    Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                    break;
+                }
 
-            case 0x08: // data8 / 8-bit data
-            case 0x18: // map8 / 8-bit bitmap
-            case 0x20: // uint8 / Unsigned  8-bit integer
-            case 0x30: // enum8 / 8-bit enumeration
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t value = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  value: 0x%02x", value);
+                case 0x08: // data8 / 8-bit data
+                case 0x18: // map8 / 8-bit bitmap
+                case 0x20: // uint8 / Unsigned  8-bit integer
+                case 0x30: // enum8 / 8-bit enumeration
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t value = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  value: 0x%02x", value);
 
-                Callback::Callback<Int8uAttributeCallback> * cb =
-                    Callback::Callback<Int8uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int8uAttributeCallback> * cb = Callback::Callback<Int8uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x09: // data16 / 16-bit data
-            case 0x19: // map16 / 16-bit bitmap
-            case 0x21: // uint16 / Unsigned 16-bit integer
-            case 0x31: // enum16 / 16-bit enumeration
-            case 0xE8: // clusterId / Cluster ID
-            case 0xE9: // attribId / Attribute ID
-            case 0xEA: // bacOID / BACnet OID
-            case 0xF1: // key128 / 128-bit security key
-            case 0xFF: // unk / Unknown
-            {
-                CHECK_MESSAGE_LENGTH(2);
-                uint16_t value = chip::Encoding::LittleEndian::Read16(message);
-                ChipLogProgress(Zcl, "  value: 0x%04x", value);
+                case 0x09: // data16 / 16-bit data
+                case 0x19: // map16 / 16-bit bitmap
+                case 0x21: // uint16 / Unsigned 16-bit integer
+                case 0x31: // enum16 / 16-bit enumeration
+                case 0xE8: // clusterId / Cluster ID
+                case 0xE9: // attribId / Attribute ID
+                case 0xEA: // bacOID / BACnet OID
+                case 0xF1: // key128 / 128-bit security key
+                case 0xFF: // unk / Unknown
+                {
+                    CHECK_MESSAGE_LENGTH(2);
+                    uint16_t value = chip::Encoding::LittleEndian::Read16(message);
+                    ChipLogProgress(Zcl, "  value: 0x%04x", value);
 
-                Callback::Callback<Int16uAttributeCallback> * cb =
-                    Callback::Callback<Int16uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int16uAttributeCallback> * cb = Callback::Callback<Int16uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x0B: // data32 / 32-bit data
-            case 0x1B: // map32 / 32-bit bitmap
-            case 0x23: // uint32 / Unsigned 32-bit integer
-            case 0xE1: // date / Date
-            case 0xE2: // UTC / UTCTime
-            {
-                CHECK_MESSAGE_LENGTH(4);
-                uint32_t value = chip::Encoding::LittleEndian::Read32(message);
-                ChipLogProgress(Zcl, "  value: 0x%08x", value);
+                case 0x0B: // data32 / 32-bit data
+                case 0x1B: // map32 / 32-bit bitmap
+                case 0x23: // uint32 / Unsigned 32-bit integer
+                case 0xE1: // date / Date
+                case 0xE2: // UTC / UTCTime
+                {
+                    CHECK_MESSAGE_LENGTH(4);
+                    uint32_t value = chip::Encoding::LittleEndian::Read32(message);
+                    ChipLogProgress(Zcl, "  value: 0x%08x", value);
 
-                Callback::Callback<Int32uAttributeCallback> * cb =
-                    Callback::Callback<Int32uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int32uAttributeCallback> * cb = Callback::Callback<Int32uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x0F: // data64 / 64-bit data
-            case 0x1F: // map64 / 64-bit bitmap
-            case 0x27: // uint64 / Unsigned 64-bit integer
-            case 0xF0: // EUI64 / IEEE address
-            {
-                CHECK_MESSAGE_LENGTH(8);
-                uint64_t value = chip::Encoding::LittleEndian::Read64(message);
-                ChipLogProgress(Zcl, "  value: 0x%16x", value);
+                case 0x0F: // data64 / 64-bit data
+                case 0x1F: // map64 / 64-bit bitmap
+                case 0x27: // uint64 / Unsigned 64-bit integer
+                case 0xF0: // EUI64 / IEEE address
+                {
+                    CHECK_MESSAGE_LENGTH(8);
+                    uint64_t value = chip::Encoding::LittleEndian::Read64(message);
+                    ChipLogProgress(Zcl, "  value: 0x%16x", value);
 
-                Callback::Callback<Int64uAttributeCallback> * cb =
-                    Callback::Callback<Int64uAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int64uAttributeCallback> * cb = Callback::Callback<Int64uAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x10: // bool / Boolean
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                uint8_t value = chip::Encoding::Read8(message);
-                ChipLogProgress(Zcl, "  value: %d", value);
+                case 0x10: // bool / Boolean
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    uint8_t value = chip::Encoding::Read8(message);
+                    ChipLogProgress(Zcl, "  value: %d", value);
 
-                Callback::Callback<BooleanAttributeCallback> * cb =
-                    Callback::Callback<BooleanAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<BooleanAttributeCallback> * cb = Callback::Callback<BooleanAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x28: // int8 / Signed 8-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(1);
-                int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
-                ChipLogProgress(Zcl, "  value: %" PRId8, value);
+                case 0x28: // int8 / Signed 8-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(1);
+                    int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId8, value);
 
-                Callback::Callback<Int8sAttributeCallback> * cb =
-                    Callback::Callback<Int8sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int8sAttributeCallback> * cb = Callback::Callback<Int8sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x29: // int16 / Signed 16-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(2);
-                int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
-                ChipLogProgress(Zcl, "  value: %" PRId16, value);
+                case 0x29: // int16 / Signed 16-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(2);
+                    int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId16, value);
 
-                Callback::Callback<Int16sAttributeCallback> * cb =
-                    Callback::Callback<Int16sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int16sAttributeCallback> * cb = Callback::Callback<Int16sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x2B: // int32 / Signed 32-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(4);
-                int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
-                ChipLogProgress(Zcl, "  value: %" PRId32, value);
+                case 0x2B: // int32 / Signed 32-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(4);
+                    int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId32, value);
 
-                Callback::Callback<Int32sAttributeCallback> * cb =
-                    Callback::Callback<Int32sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int32sAttributeCallback> * cb = Callback::Callback<Int32sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
 
-            case 0x2F: // int64 / Signed 64-bit integer
-            {
-                CHECK_MESSAGE_LENGTH(8);
-                int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
-                ChipLogProgress(Zcl, "  value: %" PRId64, value);
+                case 0x2F: // int64 / Signed 64-bit integer
+                {
+                    CHECK_MESSAGE_LENGTH(8);
+                    int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
+                    ChipLogProgress(Zcl, "  value: %" PRId64, value);
 
-                Callback::Callback<Int64sAttributeCallback> * cb =
-                    Callback::Callback<Int64sAttributeCallback>::FromCancelable(onSuccessCallback);
-                cb->mCall(cb->mContext, value);
-                break;
-            }
+                    Callback::Callback<Int64sAttributeCallback> * cb = Callback::Callback<Int64sAttributeCallback>::FromCancelable(onSuccessCallback);
+                    cb->mCall(cb->mContext, value);
+                    break;
+                }
             }
         }
         else
         {
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
-        // The current code is written matching the current API where there is a single attribute read
+        // The current code is written matching the current API where there is a single attribute read 
         // per read command. So if multiple attributes are read at the same time, something is wrong
         // somewhere.
         if (messageLen)
@@ -490,8 +475,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa
 
         if (status == EMBER_ZCL_STATUS_SUCCESS)
         {
-            Callback::Callback<DefaultSuccessCallback> * cb =
-                Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext);
         }
         else
@@ -500,8 +484,7 @@ bool emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * messa
             uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId
             ChipLogProgress(Zcl, "  attributeId: 0x%04x", attributeId);
 
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
@@ -534,8 +517,7 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me
 
         if (status == EMBER_ZCL_STATUS_SUCCESS)
         {
-            Callback::Callback<DefaultSuccessCallback> * cb =
-                Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<DefaultSuccessCallback> * cb = Callback::Callback<DefaultSuccessCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext);
         }
         else
@@ -548,12 +530,11 @@ bool emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * me
             uint16_t attributeId = chip::Encoding::LittleEndian::Read16(message); // attribId
             ChipLogProgress(Zcl, "  attributeId: 0x%04x", attributeId);
 
-            Callback::Callback<DefaultFailureCallback> * cb =
-                Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+            Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
             cb->mCall(cb->mContext, status);
         }
 
-        // The current code is written matching the current API where there is a single attribute report
+        // The current code is written matching the current API where there is a single attribute report 
         // per configure command. So if multiple attributes are configured at the same time, something is wrong
         // somewhere.
         if (messageLen)
@@ -600,8 +581,7 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
 
             // FIXME: unk is not supported yet.
 
-            Callback::Callback<ReadReportingConfigurationReportedCallback> * cb =
-                Callback::Callback<ReadReportingConfigurationReportedCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<ReadReportingConfigurationReportedCallback> * cb = Callback::Callback<ReadReportingConfigurationReportedCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext, minimumReportingInterval, maximumReportingInterval);
         }
         else
@@ -610,8 +590,7 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
             uint16_t timeout = chip::Encoding::LittleEndian::Read16(message); // uint16
             ChipLogProgress(Zcl, "  timeout: %" PRIu16, timeout);
 
-            Callback::Callback<ReadReportingConfigurationReceivedCallback> * cb =
-                Callback::Callback<ReadReportingConfigurationReceivedCallback>::FromCancelable(onSuccessCallback);
+            Callback::Callback<ReadReportingConfigurationReceivedCallback> * cb = Callback::Callback<ReadReportingConfigurationReceivedCallback>::FromCancelable(onSuccessCallback);
             cb->mCall(cb->mContext, timeout);
         }
     }
@@ -695,14 +674,12 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> * cb = Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -716,14 +693,12 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> * cb = Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -737,14 +712,12 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -758,14 +731,12 @@ bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearPinResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearPinResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearPinResponseCallback> * cb = Callback::Callback<DoorLockClusterClearPinResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -779,14 +750,12 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearRfidResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearRfidResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearRfidResponseCallback> * cb = Callback::Callback<DoorLockClusterClearRfidResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -800,14 +769,12 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -821,20 +788,17 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
 
-bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime,
-                                                              uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
 {
     ChipLogProgress(Zcl, "GetHolidayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -847,20 +811,17 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     return true;
 }
 
-bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-                                                        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
+bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
 {
     ChipLogProgress(Zcl, "GetLogRecordResponse:");
     ChipLogProgress(Zcl, "  logEntryId: %" PRIu16 "", logEntryId);
@@ -873,8 +834,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uin
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetLogRecordResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> * cb = Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin);
     return true;
 }
@@ -889,8 +850,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userS
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetPinResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetPinResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetPinResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetPinResponseCallback> * cb = Callback::Callback<DoorLockClusterGetPinResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, userId, userStatus, userType, pin);
     return true;
 }
@@ -905,8 +866,8 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t user
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetRfidResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetRfidResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetRfidResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetRfidResponseCallback> * cb = Callback::Callback<DoorLockClusterGetRfidResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, userId, userStatus, userType, rfid);
     return true;
 }
@@ -919,15 +880,13 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t
 
     GET_RESPONSE_CALLBACKS("DoorLockClusterGetUserTypeResponseCallback");
 
-    Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> * cb = Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, userId, userType);
     return true;
 }
 
-bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask,
-                                                              uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-                                                              uint8_t endMinute)
+bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     ChipLogProgress(Zcl, "GetWeekdayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -943,20 +902,17 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     return true;
 }
 
-bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status,
-                                                              uint32_t localStartTime, uint32_t localEndTime)
+bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime)
 {
     ChipLogProgress(Zcl, "GetYeardayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -969,14 +925,12 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, scheduleId, userId, localStartTime, localEndTime);
     return true;
 }
@@ -990,14 +944,12 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterLockDoorResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterLockDoorResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterLockDoorResponseCallback> * cb = Callback::Callback<DoorLockClusterLockDoorResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1011,14 +963,12 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1032,14 +982,12 @@ bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetPinResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetPinResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetPinResponseCallback> * cb = Callback::Callback<DoorLockClusterSetPinResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1053,14 +1001,12 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetRfidResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetRfidResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetRfidResponseCallback> * cb = Callback::Callback<DoorLockClusterSetRfidResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1074,14 +1020,12 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> * cb = Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1095,14 +1039,12 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1116,14 +1058,12 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> * cb = Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1137,14 +1077,12 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> * cb = Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1158,14 +1096,12 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status)
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> * cb =
-        Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> * cb = Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext);
     return true;
 }
@@ -1178,8 +1114,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t error
 
     GET_RESPONSE_CALLBACKS("GeneralCommissioningClusterArmFailSafeResponseCallback");
 
-    Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> * cb =
-        Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> * cb = Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, errorCode, debugText);
     return true;
 }
@@ -1192,8 +1128,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uin
 
     GET_RESPONSE_CALLBACKS("GeneralCommissioningClusterCommissioningCompleteResponseCallback");
 
-    Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> * cb =
-        Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> * cb = Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, errorCode, debugText);
     return true;
 }
@@ -1206,8 +1142,8 @@ bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCo
 
     GET_RESPONSE_CALLBACKS("GeneralCommissioningClusterSetFabricResponseCallback");
 
-    Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> * cb =
-        Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> * cb = Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, errorCode, debugText);
     return true;
 }
@@ -1222,20 +1158,17 @@ bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t group
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<GroupsClusterAddGroupResponseCallback> * cb =
-        Callback::Callback<GroupsClusterAddGroupResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<GroupsClusterAddGroupResponseCallback> * cb = Callback::Callback<GroupsClusterAddGroupResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId);
     return true;
 }
 
-bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
+bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList)
 {
     ChipLogProgress(Zcl, "GetGroupMembershipResponse:");
     ChipLogProgress(Zcl, "  capacity: %" PRIu8 "", capacity);
@@ -1244,8 +1177,8 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, ui
 
     GET_RESPONSE_CALLBACKS("GroupsClusterGetGroupMembershipResponseCallback");
 
-    Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> * cb =
-        Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> * cb = Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, capacity, groupCount, groupList);
     return true;
 }
@@ -1260,14 +1193,12 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t gr
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<GroupsClusterRemoveGroupResponseCallback> * cb =
-        Callback::Callback<GroupsClusterRemoveGroupResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<GroupsClusterRemoveGroupResponseCallback> * cb = Callback::Callback<GroupsClusterRemoveGroupResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId);
     return true;
 }
@@ -1283,14 +1214,12 @@ bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t grou
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<GroupsClusterViewGroupResponseCallback> * cb =
-        Callback::Callback<GroupsClusterViewGroupResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<GroupsClusterViewGroupResponseCallback> * cb = Callback::Callback<GroupsClusterViewGroupResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, groupName);
     return true;
 }
@@ -1302,8 +1231,8 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout)
 
     GET_RESPONSE_CALLBACKS("IdentifyClusterIdentifyQueryResponseCallback");
 
-    Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> * cb =
-        Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>::FromCancelable(onSuccessCallback);
+
+    Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> * cb = Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, timeout);
     return true;
 }
@@ -1319,20 +1248,17 @@ bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t group
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterAddSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterAddSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterAddSceneResponseCallback> * cb = Callback::Callback<ScenesClusterAddSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId);
     return true;
 }
 
-bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
+bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList)
 {
     ChipLogProgress(Zcl, "GetSceneMembershipResponse:");
     LogStatus(status);
@@ -1345,14 +1271,12 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> * cb =
-        Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> * cb = Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, capacity, groupId, sceneCount, sceneList);
     return true;
 }
@@ -1367,14 +1291,12 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> * cb =
-        Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> * cb = Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId);
     return true;
 }
@@ -1390,14 +1312,12 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t gr
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterRemoveSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterRemoveSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterRemoveSceneResponseCallback> * cb = Callback::Callback<ScenesClusterRemoveSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId);
     return true;
 }
@@ -1413,21 +1333,17 @@ bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t gro
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterStoreSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterStoreSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterStoreSceneResponseCallback> * cb = Callback::Callback<ScenesClusterStoreSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId);
     return true;
 }
 
-bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                                   uint8_t * sceneName,
-                                                   /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
+bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
 {
     ChipLogProgress(Zcl, "ViewSceneResponse:");
     LogStatus(status);
@@ -1441,18 +1357,17 @@ bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t grou
 
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
-        Callback::Callback<DefaultFailureCallback> * cb =
-            Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
+        Callback::Callback<DefaultFailureCallback> * cb = Callback::Callback<DefaultFailureCallback>::FromCancelable(onFailureCallback);
         cb->mCall(cb->mContext, status);
         return true;
     }
 
-    Callback::Callback<ScenesClusterViewSceneResponseCallback> * cb =
-        Callback::Callback<ScenesClusterViewSceneResponseCallback>::FromCancelable(onSuccessCallback);
+    Callback::Callback<ScenesClusterViewSceneResponseCallback> * cb = Callback::Callback<ScenesClusterViewSceneResponseCallback>::FromCancelable(onSuccessCallback);
     cb->mCall(cb->mContext, groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
     return true;
 }
 
+
 bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uint16_t messageLen)
 {
     ChipLogProgress(Zcl, "emberAfReportAttributeCallback:");
@@ -1481,203 +1396,192 @@ bool emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * message, uin
 
         switch (attributeType)
         {
-        case 0x00: // nodata / No data
-        case 0x0A: // data24 / 24-bit data
-        case 0x0C: // data40 / 40-bit data
-        case 0x0D: // data48 / 48-bit data
-        case 0x0E: // data56 / 56-bit data
-        case 0x1A: // map24 / 24-bit bitmap
-        case 0x1C: // map40 / 40-bit bitmap
-        case 0x1D: // map48 / 48-bit bitmap
-        case 0x1E: // map56 / 56-bit bitmap
-        case 0x22: // uint24 / Unsigned 24-bit integer
-        case 0x24: // uint40 / Unsigned 40-bit integer
-        case 0x25: // uint48 / Unsigned 48-bit integer
-        case 0x26: // uint56 / Unsigned 56-bit integer
-        case 0x2A: // int24 / Signed 24-bit integer
-        case 0x2C: // int40 / Signed 40-bit integer
-        case 0x2D: // int48 / Signed 48-bit integer
-        case 0x2E: // int56 / Signed 56-bit integer
-        case 0x38: // semi / Semi-precision
-        case 0x39: // single / Single precision
-        case 0x3A: // double / Double precision
-        case 0x48: // array / Array
-        case 0x49: // struct / Structure
-        case 0x50: // set / Set
-        case 0x51: // bag / Bag
-        case 0xE0: // ToD / Time of day
-        {
-            ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
-            return true;
-        }
-
-        case 0x41: // octstr / Octet string
-        case 0x42: // string / Character string
-        {
-            // Short Strings must contains at least one byte for the length
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t length = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  length: 0x%02x", length);
-
-            // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
-            if (length == 0xFF)
+            case 0x00: // nodata / No data
+            case 0x0A: // data24 / 24-bit data
+            case 0x0C: // data40 / 40-bit data
+            case 0x0D: // data48 / 48-bit data
+            case 0x0E: // data56 / 56-bit data
+            case 0x1A: // map24 / 24-bit bitmap
+            case 0x1C: // map40 / 40-bit bitmap
+            case 0x1D: // map48 / 48-bit bitmap
+            case 0x1E: // map56 / 56-bit bitmap
+            case 0x22: // uint24 / Unsigned 24-bit integer
+            case 0x24: // uint40 / Unsigned 40-bit integer
+            case 0x25: // uint48 / Unsigned 48-bit integer
+            case 0x26: // uint56 / Unsigned 56-bit integer
+            case 0x2A: // int24 / Signed 24-bit integer
+            case 0x2C: // int40 / Signed 40-bit integer
+            case 0x2D: // int48 / Signed 48-bit integer
+            case 0x2E: // int56 / Signed 56-bit integer
+            case 0x38: // semi / Semi-precision
+            case 0x39: // single / Single precision
+            case 0x3A: // double / Double precision
+            case 0x48: // array / Array
+            case 0x49: // struct / Structure
+            case 0x50: // set / Set
+            case 0x51: // bag / Bag
+            case 0xE0: // ToD / Time of day
             {
-                length = 0;
+                ChipLogError(Zcl, "attributeType 0x%02x is not supported", attributeType);
+                return true;
             }
 
-            CHECK_MESSAGE_LENGTH(length);
-            Callback::Callback<StringAttributeCallback> * cb =
-                Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-            break;
-        }
+            case 0x41: // octstr / Octet string
+            case 0x42: // string / Character string
+            {
+                // Short Strings must contains at least one byte for the length
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t length = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  length: 0x%02x", length);
 
-        case 0x43: // octstr16 / Long octet string
-        case 0x44: // string16 / Long character string
-        {
-            // Long Strings must contains at least two bytes for the length
-            CHECK_MESSAGE_LENGTH(2);
-            uint16_t length = chip::Encoding::LittleEndian::Read16(message);
-            ChipLogProgress(Zcl, "  length: 0x%02x", length);
+                // When the length is set to 0xFF, it represents a non-value. In this case the data field is zero length.
+                if (length == 0xFF)
+                {
+                    length = 0;
+                }
 
-            // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
-            if (length == 0xFFFF)
-            {
-                length = 0;
+                CHECK_MESSAGE_LENGTH(length);
+                Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                break;
             }
 
-            CHECK_MESSAGE_LENGTH(length);
-            Callback::Callback<StringAttributeCallback> * cb =
-                Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, chip::ByteSpan(message, length));
-            break;
-        }
+            case 0x43: // octstr16 / Long octet string
+            case 0x44: // string16 / Long character string
+            {
+                // Long Strings must contains at least two bytes for the length
+                CHECK_MESSAGE_LENGTH(2);
+                uint16_t length = chip::Encoding::LittleEndian::Read16(message);
+                ChipLogProgress(Zcl, "  length: 0x%02x", length);
 
-        case 0x08: // data8 / 8-bit data
-        case 0x18: // map8 / 8-bit bitmap
-        case 0x20: // uint8 / Unsigned  8-bit integer
-        case 0x30: // enum8 / 8-bit enumeration
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t value = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  value: 0x%02x", value);
+                // When the length is set to 0xFFFF, it represents a non-value. In this case the data field is zero length.
+                if (length == 0xFFFF)
+                {
+                    length = 0;
+                }
 
-            Callback::Callback<Int8uAttributeCallback> * cb =
-                Callback::Callback<Int8uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                CHECK_MESSAGE_LENGTH(length);
+                Callback::Callback<StringAttributeCallback> * cb = Callback::Callback<StringAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, chip::ByteSpan(message, length));
+                break;
+            }
 
-        case 0x09: // data16 / 16-bit data
-        case 0x19: // map16 / 16-bit bitmap
-        case 0x21: // uint16 / Unsigned 16-bit integer
-        case 0x31: // enum16 / 16-bit enumeration
-        case 0xE8: // clusterId / Cluster ID
-        case 0xE9: // attribId / Attribute ID
-        case 0xEA: // bacOID / BACnet OID
-        case 0xF1: // key128 / 128-bit security key
-        case 0xFF: // unk / Unknown
-        {
-            CHECK_MESSAGE_LENGTH(2);
-            uint16_t value = chip::Encoding::LittleEndian::Read16(message);
-            ChipLogProgress(Zcl, "  value: 0x%04x", value);
+            case 0x08: // data8 / 8-bit data
+            case 0x18: // map8 / 8-bit bitmap
+            case 0x20: // uint8 / Unsigned  8-bit integer
+            case 0x30: // enum8 / 8-bit enumeration
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t value = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  value: 0x%02x", value);
 
-            Callback::Callback<Int16uAttributeCallback> * cb =
-                Callback::Callback<Int16uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int8uAttributeCallback> * cb = Callback::Callback<Int8uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x0B: // data32 / 32-bit data
-        case 0x1B: // map32 / 32-bit bitmap
-        case 0x23: // uint32 / Unsigned 32-bit integer
-        case 0xE1: // date / Date
-        case 0xE2: // UTC / UTCTime
-        {
-            CHECK_MESSAGE_LENGTH(4);
-            uint32_t value = chip::Encoding::LittleEndian::Read32(message);
-            ChipLogProgress(Zcl, "  value: 0x%08x", value);
+            case 0x09: // data16 / 16-bit data
+            case 0x19: // map16 / 16-bit bitmap
+            case 0x21: // uint16 / Unsigned 16-bit integer
+            case 0x31: // enum16 / 16-bit enumeration
+            case 0xE8: // clusterId / Cluster ID
+            case 0xE9: // attribId / Attribute ID
+            case 0xEA: // bacOID / BACnet OID
+            case 0xF1: // key128 / 128-bit security key
+            case 0xFF: // unk / Unknown
+            {
+                CHECK_MESSAGE_LENGTH(2);
+                uint16_t value = chip::Encoding::LittleEndian::Read16(message);
+                ChipLogProgress(Zcl, "  value: 0x%04x", value);
 
-            Callback::Callback<Int32uAttributeCallback> * cb =
-                Callback::Callback<Int32uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int16uAttributeCallback> * cb = Callback::Callback<Int16uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x0F: // data64 / 64-bit data
-        case 0x1F: // map64 / 64-bit bitmap
-        case 0x27: // uint64 / Unsigned 64-bit integer
-        case 0xF0: // EUI64 / IEEE address
-        {
-            CHECK_MESSAGE_LENGTH(8);
-            uint64_t value = chip::Encoding::LittleEndian::Read64(message);
-            ChipLogProgress(Zcl, "  value: 0x%16x", value);
+            case 0x0B: // data32 / 32-bit data
+            case 0x1B: // map32 / 32-bit bitmap
+            case 0x23: // uint32 / Unsigned 32-bit integer
+            case 0xE1: // date / Date
+            case 0xE2: // UTC / UTCTime
+            {
+                CHECK_MESSAGE_LENGTH(4);
+                uint32_t value = chip::Encoding::LittleEndian::Read32(message);
+                ChipLogProgress(Zcl, "  value: 0x%08x", value);
 
-            Callback::Callback<Int64uAttributeCallback> * cb =
-                Callback::Callback<Int64uAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int32uAttributeCallback> * cb = Callback::Callback<Int32uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x10: // bool / Boolean
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            uint8_t value = chip::Encoding::Read8(message);
-            ChipLogProgress(Zcl, "  value: %d", value);
+            case 0x0F: // data64 / 64-bit data
+            case 0x1F: // map64 / 64-bit bitmap
+            case 0x27: // uint64 / Unsigned 64-bit integer
+            case 0xF0: // EUI64 / IEEE address
+            {
+                CHECK_MESSAGE_LENGTH(8);
+                uint64_t value = chip::Encoding::LittleEndian::Read64(message);
+                ChipLogProgress(Zcl, "  value: 0x%16x", value);
 
-            Callback::Callback<BooleanAttributeCallback> * cb =
-                Callback::Callback<BooleanAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int64uAttributeCallback> * cb = Callback::Callback<Int64uAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x28: // int8 / Signed 8-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(1);
-            int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
-            ChipLogProgress(Zcl, "  value: %" PRId8, value);
+            case 0x10: // bool / Boolean
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                uint8_t value = chip::Encoding::Read8(message);
+                ChipLogProgress(Zcl, "  value: %d", value);
 
-            Callback::Callback<Int8sAttributeCallback> * cb =
-                Callback::Callback<Int8sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<BooleanAttributeCallback> * cb = Callback::Callback<BooleanAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x29: // int16 / Signed 16-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(2);
-            int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
-            ChipLogProgress(Zcl, "  value: %" PRId16, value);
+            case 0x28: // int8 / Signed 8-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(1);
+                int8_t value = chip::CastToSigned(chip::Encoding::Read8(message));
+                ChipLogProgress(Zcl, "  value: %" PRId8, value);
 
-            Callback::Callback<Int16sAttributeCallback> * cb =
-                Callback::Callback<Int16sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int8sAttributeCallback> * cb = Callback::Callback<Int8sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x2B: // int32 / Signed 32-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(4);
-            int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
-            ChipLogProgress(Zcl, "  value: %" PRId32, value);
+            case 0x29: // int16 / Signed 16-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(2);
+                int16_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read16(message));
+                ChipLogProgress(Zcl, "  value: %" PRId16, value);
 
-            Callback::Callback<Int32sAttributeCallback> * cb =
-                Callback::Callback<Int32sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int16sAttributeCallback> * cb = Callback::Callback<Int16sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
 
-        case 0x2F: // int64 / Signed 64-bit integer
-        {
-            CHECK_MESSAGE_LENGTH(8);
-            int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
-            ChipLogProgress(Zcl, "  value: %" PRId64, value);
+            case 0x2B: // int32 / Signed 32-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(4);
+                int32_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read32(message));
+                ChipLogProgress(Zcl, "  value: %" PRId32, value);
 
-            Callback::Callback<Int64sAttributeCallback> * cb =
-                Callback::Callback<Int64sAttributeCallback>::FromCancelable(onReportCallback);
-            cb->mCall(cb->mContext, value);
-            break;
-        }
+                Callback::Callback<Int32sAttributeCallback> * cb = Callback::Callback<Int32sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
+
+            case 0x2F: // int64 / Signed 64-bit integer
+            {
+                CHECK_MESSAGE_LENGTH(8);
+                int64_t value = chip::CastToSigned(chip::Encoding::LittleEndian::Read64(message));
+                ChipLogProgress(Zcl, "  value: %" PRId64, value);
+
+                Callback::Callback<Int64sAttributeCallback> * cb = Callback::Callback<Int64sAttributeCallback>::FromCancelable(onReportCallback);
+                cb->mCall(cb->mContext, value);
+                break;
+            }
         }
     }
 
diff --git a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.h b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.h
index a6adcbc4a710b6..7e0d3882f082c2 100644
--- a/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.h
+++ b/src/darwin/Framework/CHIP/gen/CHIPClientCallbacks.h
@@ -35,8 +35,8 @@ typedef void (*Int32sAttributeCallback)(void * context, int32_t value);
 typedef void (*Int64uAttributeCallback)(void * context, uint64_t value);
 typedef void (*Int64sAttributeCallback)(void * context, int64_t value);
 typedef void (*StringAttributeCallback)(void * context, const chip::ByteSpan value);
-typedef void (*ReadReportingConfigurationReportedCallback)(void * context, uint16_t minInterval, uint16_t maxInterval);
-typedef void (*ReadReportingConfigurationReceivedCallback)(void * context, uint16_t timeout);
+typedef void (*ReadReportingConfigurationReportedCallback)(void* context, uint16_t minInterval, uint16_t maxInterval);
+typedef void (*ReadReportingConfigurationReceivedCallback)(void* context, uint16_t timeout);
 
 // Cluster Specific Response Callbacks
 typedef void (*DoorLockClusterClearAllPinsResponseCallback)(void * context);
@@ -46,21 +46,13 @@ typedef void (*DoorLockClusterClearPinResponseCallback)(void * context);
 typedef void (*DoorLockClusterClearRfidResponseCallback)(void * context);
 typedef void (*DoorLockClusterClearWeekdayScheduleResponseCallback)(void * context);
 typedef void (*DoorLockClusterClearYeardayScheduleResponseCallback)(void * context);
-typedef void (*DoorLockClusterGetHolidayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint32_t localStartTime,
-                                                                  uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
-typedef void (*DoorLockClusterGetLogRecordResponseCallback)(void * context, uint16_t logEntryId, uint32_t timestamp,
-                                                            uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode,
-                                                            uint16_t userId, uint8_t * pin);
-typedef void (*DoorLockClusterGetPinResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                      uint8_t * pin);
-typedef void (*DoorLockClusterGetRfidResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                       uint8_t * rfid);
+typedef void (*DoorLockClusterGetHolidayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
+typedef void (*DoorLockClusterGetLogRecordResponseCallback)(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin);
+typedef void (*DoorLockClusterGetPinResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin);
+typedef void (*DoorLockClusterGetRfidResponseCallback)(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid);
 typedef void (*DoorLockClusterGetUserTypeResponseCallback)(void * context, uint16_t userId, uint8_t userType);
-typedef void (*DoorLockClusterGetWeekdayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId,
-                                                                  uint8_t daysMask, uint8_t startHour, uint8_t startMinute,
-                                                                  uint8_t endHour, uint8_t endMinute);
-typedef void (*DoorLockClusterGetYeardayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId,
-                                                                  uint32_t localStartTime, uint32_t localEndTime);
+typedef void (*DoorLockClusterGetWeekdayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+typedef void (*DoorLockClusterGetYeardayScheduleResponseCallback)(void * context, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime);
 typedef void (*DoorLockClusterLockDoorResponseCallback)(void * context);
 typedef void (*DoorLockClusterSetHolidayScheduleResponseCallback)(void * context);
 typedef void (*DoorLockClusterSetPinResponseCallback)(void * context);
@@ -71,22 +63,16 @@ typedef void (*DoorLockClusterSetYeardayScheduleResponseCallback)(void * context
 typedef void (*DoorLockClusterUnlockDoorResponseCallback)(void * context);
 typedef void (*DoorLockClusterUnlockWithTimeoutResponseCallback)(void * context);
 typedef void (*GeneralCommissioningClusterArmFailSafeResponseCallback)(void * context, uint8_t errorCode, uint8_t * debugText);
-typedef void (*GeneralCommissioningClusterCommissioningCompleteResponseCallback)(void * context, uint8_t errorCode,
-                                                                                 uint8_t * debugText);
+typedef void (*GeneralCommissioningClusterCommissioningCompleteResponseCallback)(void * context, uint8_t errorCode, uint8_t * debugText);
 typedef void (*GeneralCommissioningClusterSetFabricResponseCallback)(void * context, uint8_t errorCode, uint8_t * debugText);
 typedef void (*GroupsClusterAddGroupResponseCallback)(void * context, uint16_t groupId);
-typedef void (*GroupsClusterGetGroupMembershipResponseCallback)(void * context, uint8_t capacity, uint8_t groupCount,
-                                                                /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
+typedef void (*GroupsClusterGetGroupMembershipResponseCallback)(void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList);
 typedef void (*GroupsClusterRemoveGroupResponseCallback)(void * context, uint16_t groupId);
 typedef void (*GroupsClusterViewGroupResponseCallback)(void * context, uint16_t groupId, uint8_t * groupName);
 typedef void (*IdentifyClusterIdentifyQueryResponseCallback)(void * context, uint16_t timeout);
 typedef void (*ScenesClusterAddSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId);
-typedef void (*ScenesClusterGetSceneMembershipResponseCallback)(void * context, uint8_t capacity, uint16_t groupId,
-                                                                uint8_t sceneCount,
-                                                                /* TYPE WARNING: array array defaults to */ uint8_t * sceneList);
+typedef void (*ScenesClusterGetSceneMembershipResponseCallback)(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList);
 typedef void (*ScenesClusterRemoveAllScenesResponseCallback)(void * context, uint16_t groupId);
 typedef void (*ScenesClusterRemoveSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId);
 typedef void (*ScenesClusterStoreSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId);
-typedef void (*ScenesClusterViewSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                                       uint8_t * sceneName,
-                                                       /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
+typedef void (*ScenesClusterViewSceneResponseCallback)(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets);
diff --git a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h
index 93e5db92ed0c08..b25bdb215253d9 100644
--- a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h
+++ b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.h
@@ -34,20 +34,21 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface CHIPCluster : NSObject
 
-- (nullable instancetype)initWithDevice:(CHIPDevice *)device
-                               endpoint:(uint8_t)endpoint
-                                  queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint8_t)endpoint queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
 @end
 
+
+
 /**
  * Cluster Application Basic
- *
+ *    
  */
 @interface CHIPApplicationBasic : CHIPCluster
 
+
 - (void)readAttributeVendorName:(ResponseHandler)completionHandler;
 - (void)readAttributeVendorId:(ResponseHandler)completionHandler;
 - (void)readAttributeApplicationName:(ResponseHandler)completionHandler;
@@ -59,9 +60,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Barrier Control
- *
+ *    
  */
 @interface CHIPBarrierControl : CHIPCluster
 
@@ -76,9 +79,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Basic
- *
+ *    
  */
 @interface CHIPBasic : CHIPCluster
 
@@ -101,146 +106,62 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Binding
- *
+ *    
  */
 @interface CHIPBinding : CHIPCluster
 
-- (void)bind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)unbind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)bind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler;
+- (void)unbind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster Color Control
- *
+ *    
  */
 @interface CHIPColorControl : CHIPCluster
 
-- (void)moveColor:(int16_t)rateX
-                rateY:(int16_t)rateY
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveColorTemperature:(uint8_t)moveMode
-                        rate:(uint16_t)rate
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler;
-- (void)moveHue:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveSaturation:(uint8_t)moveMode
-                  rate:(uint8_t)rate
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToColor:(uint16_t)colorX
-               colorY:(uint16_t)colorY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToColorTemperature:(uint16_t)colorTemperature
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToHue:(uint8_t)hue
-            direction:(uint8_t)direction
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToHueAndSaturation:(uint8_t)hue
-                    saturation:(uint8_t)saturation
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToSaturation:(uint8_t)saturation
-          transitionTime:(uint16_t)transitionTime
-             optionsMask:(uint8_t)optionsMask
-         optionsOverride:(uint8_t)optionsOverride
-       completionHandler:(ResponseHandler)completionHandler;
-- (void)stepColor:(int16_t)stepX
-                stepY:(int16_t)stepY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepColorTemperature:(uint8_t)stepMode
-                    stepSize:(uint16_t)stepSize
-              transitionTime:(uint16_t)transitionTime
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler;
-- (void)stepHue:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint8_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepSaturation:(uint8_t)stepMode
-              stepSize:(uint8_t)stepSize
-        transitionTime:(uint8_t)transitionTime
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler;
-- (void)stopMoveStep:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)moveColor:(int16_t)rateX rateY:(int16_t)rateY optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveColorTemperature:(uint8_t)moveMode rate:(uint16_t)rate colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveHue:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveSaturation:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToColor:(uint16_t)colorX colorY:(uint16_t)colorY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToColorTemperature:(uint16_t)colorTemperature transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToHue:(uint8_t)hue direction:(uint8_t)direction transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToHueAndSaturation:(uint8_t)hue saturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToSaturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepColor:(int16_t)stepX stepY:(int16_t)stepY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepColorTemperature:(uint8_t)stepMode stepSize:(uint16_t)stepSize transitionTime:(uint16_t)transitionTime colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepHue:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepSaturation:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stopMoveStep:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeCurrentHue:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentHue:(uint16_t)minInterval
-                         maxInterval:(uint16_t)maxInterval
-                              change:(uint8_t)change
-                   completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentHue:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentHue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentHue:(ResponseHandler)reportHandler;
 - (void)readAttributeCurrentSaturation:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
-                                maxInterval:(uint16_t)maxInterval
-                                     change:(uint8_t)change
-                          completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentSaturation:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentSaturation:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentSaturation:(ResponseHandler)reportHandler;
 - (void)readAttributeRemainingTime:(ResponseHandler)completionHandler;
 - (void)readAttributeCurrentX:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentX:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentX:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentX:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentX:(ResponseHandler)reportHandler;
 - (void)readAttributeCurrentY:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentY:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentY:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentY:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentY:(ResponseHandler)reportHandler;
 - (void)readAttributeDriftCompensation:(ResponseHandler)completionHandler;
 - (void)readAttributeCompensationText:(ResponseHandler)completionHandler;
 - (void)readAttributeColorTemperature:(ResponseHandler)completionHandler;
-- (void)configureAttributeColorTemperature:(uint16_t)minInterval
-                               maxInterval:(uint16_t)maxInterval
-                                    change:(uint16_t)change
-                         completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeColorTemperature:(ResponseHandler)reportHandler;
+- (void) configureAttributeColorTemperature:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeColorTemperature:(ResponseHandler)reportHandler;
 - (void)readAttributeColorMode:(ResponseHandler)completionHandler;
 - (void)readAttributeColorControlOptions:(ResponseHandler)completionHandler;
 - (void)writeAttributeColorControlOptions:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
@@ -300,9 +221,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Door Lock
- *
+ *    
  */
 @interface CHIPDoorLock : CHIPCluster
 
@@ -321,65 +244,35 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler;
 - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler;
 - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
-- (void)setHolidaySchedule:(uint8_t)scheduleId
-                localStartTime:(uint32_t)localStartTime
-                  localEndTime:(uint32_t)localEndTime
-    operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday
-             completionHandler:(ResponseHandler)completionHandler;
-- (void)setPin:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                  pin:(NSString *)pin
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)setRfid:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                   id:(NSString *)id
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)setHolidaySchedule:(uint8_t)scheduleId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday completionHandler:(ResponseHandler)completionHandler;
+- (void)setPin:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
+- (void)setRfid:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType id:(NSString *)id completionHandler:(ResponseHandler)completionHandler;
 - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandler:(ResponseHandler)completionHandler;
-- (void)setWeekdaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-                  daysMask:(uint8_t)daysMask
-                 startHour:(uint8_t)startHour
-               startMinute:(uint8_t)startMinute
-                   endHour:(uint8_t)endHour
-                 endMinute:(uint8_t)endMinute
-         completionHandler:(ResponseHandler)completionHandler;
-- (void)setYeardaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-            localStartTime:(uint32_t)localStartTime
-              localEndTime:(uint32_t)localEndTime
-         completionHandler:(ResponseHandler)completionHandler;
+- (void)setWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId daysMask:(uint8_t)daysMask startHour:(uint8_t)startHour startMinute:(uint8_t)startMinute endHour:(uint8_t)endHour endMinute:(uint8_t)endMinute completionHandler:(ResponseHandler)completionHandler;
+- (void)setYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime completionHandler:(ResponseHandler)completionHandler;
 - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
 - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeLockState:(ResponseHandler)completionHandler;
-- (void)configureAttributeLockState:(uint16_t)minInterval
-                        maxInterval:(uint16_t)maxInterval
-                  completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeLockState:(ResponseHandler)reportHandler;
+- (void) configureAttributeLockState:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeLockState:(ResponseHandler)reportHandler;
 - (void)readAttributeLockType:(ResponseHandler)completionHandler;
 - (void)readAttributeActuatorEnabled:(ResponseHandler)completionHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster General Commissioning
- *
+ *    
  */
 @interface CHIPGeneralCommissioning : CHIPCluster
 
-- (void)armFailSafe:(uint16_t)expiryLengthSeconds
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)armFailSafe:(uint16_t)expiryLengthSeconds breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler;
 - (void)commissioningComplete:(ResponseHandler)completionHandler;
-- (void)setFabric:(NSData *)fabricId
-         fabricSecret:(NSData *)fabricSecret
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)setFabric:(NSData *)fabricId fabricSecret:(NSData *)fabricSecret breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler;
 
 - (void)readAttributeFabricId:(ResponseHandler)completionHandler;
 - (void)readAttributeBreadcrumb:(ResponseHandler)completionHandler;
@@ -388,16 +281,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Groups
- *
+ *    
  */
 @interface CHIPGroups : CHIPCluster
 
 - (void)addGroup:(uint16_t)groupId groupName:(NSString *)groupName completionHandler:(ResponseHandler)completionHandler;
-- (void)addGroupIfIdentifying:(uint16_t)groupId
-                    groupName:(NSString *)groupName
-            completionHandler:(ResponseHandler)completionHandler;
+- (void)addGroupIfIdentifying:(uint16_t)groupId groupName:(NSString *)groupName completionHandler:(ResponseHandler)completionHandler;
 - (void)getGroupMembership:(uint8_t)groupCount groupList:(uint16_t)groupList completionHandler:(ResponseHandler)completionHandler;
 - (void)removeAllGroups:(ResponseHandler)completionHandler;
 - (void)removeGroup:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler;
@@ -408,9 +301,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Identify
- *
+ *    
  */
 @interface CHIPIdentify : CHIPCluster
 
@@ -423,52 +318,35 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Level Control
- *
+ *    
  */
 @interface CHIPLevelControl : CHIPCluster
 
-- (void)move:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToLevel:(uint8_t)level
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)moveToLevelWithOnOff:(uint8_t)level
-              transitionTime:(uint16_t)transitionTime
-           completionHandler:(ResponseHandler)completionHandler;
+- (void)move:(uint8_t)moveMode rate:(uint8_t)rate optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToLevel:(uint8_t)level transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)moveToLevelWithOnOff:(uint8_t)level transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler;
 - (void)moveWithOnOff:(uint8_t)moveMode rate:(uint8_t)rate completionHandler:(ResponseHandler)completionHandler;
-- (void)step:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler;
-- (void)stepWithOnOff:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)step:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
+- (void)stepWithOnOff:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler;
 - (void)stop:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
 - (void)stopWithOnOff:(ResponseHandler)completionHandler;
 
 - (void)readAttributeCurrentLevel:(ResponseHandler)completionHandler;
-- (void)configureAttributeCurrentLevel:(uint16_t)minInterval
-                           maxInterval:(uint16_t)maxInterval
-                                change:(uint8_t)change
-                     completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeCurrentLevel:(ResponseHandler)reportHandler;
+- (void) configureAttributeCurrentLevel:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeCurrentLevel:(ResponseHandler)reportHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster Low Power
- *
+ *    
  */
 @interface CHIPLowPower : CHIPCluster
 
@@ -478,9 +356,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster On/off
- *
+ *    
  */
 @interface CHIPOnOff : CHIPCluster
 
@@ -489,33 +369,23 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)toggle:(ResponseHandler)completionHandler;
 
 - (void)readAttributeOnOff:(ResponseHandler)completionHandler;
-- (void)configureAttributeOnOff:(uint16_t)minInterval
-                    maxInterval:(uint16_t)maxInterval
-              completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeOnOff:(ResponseHandler)reportHandler;
+- (void) configureAttributeOnOff:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeOnOff:(ResponseHandler)reportHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
+
 /**
  * Cluster Scenes
- *
+ *    
  */
 @interface CHIPScenes : CHIPCluster
 
-- (void)addScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-            sceneName:(NSString *)sceneName
-            clusterId:(uint16_t)clusterId
-               length:(uint8_t)length
-                value:(uint8_t)value
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)addScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime sceneName:(NSString *)sceneName clusterId:(uint16_t)clusterId length:(uint8_t)length value:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
 - (void)getSceneMembership:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler;
-- (void)recallScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler;
+- (void)recallScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler;
 - (void)removeAllScenes:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler;
 - (void)removeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler;
 - (void)storeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler;
@@ -530,24 +400,25 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+
+
 /**
  * Cluster Temperature Measurement
- *
+ *    
  */
 @interface CHIPTemperatureMeasurement : CHIPCluster
 
+
 - (void)readAttributeMeasuredValue:(ResponseHandler)completionHandler;
-- (void)configureAttributeMeasuredValue:(uint16_t)minInterval
-                            maxInterval:(uint16_t)maxInterval
-                                 change:(int16_t)change
-                      completionHandler:(ResponseHandler)completionHandler;
-- (void)reportAttributeMeasuredValue:(ResponseHandler)reportHandler;
+- (void) configureAttributeMeasuredValue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(int16_t)change completionHandler:(ResponseHandler)completionHandler;
+- (void) reportAttributeMeasuredValue:(ResponseHandler)reportHandler;
 - (void)readAttributeMinMeasuredValue:(ResponseHandler)completionHandler;
 - (void)readAttributeMaxMeasuredValue:(ResponseHandler)completionHandler;
 - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;
 
 @end
 
+
 NS_ASSUME_NONNULL_END
 
 #endif /* CHIP_CLUSTERS_H */
diff --git a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm
index 3a8c26eb57f995..e2e97c4ce7b55b 100644
--- a/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/gen/CHIPClustersObjc.mm
@@ -22,8 +22,8 @@
 #import "CHIPDevice.h"
 #import "CHIPDevice_Internal.h"
 #import "CHIPError.h"
-#import "gen/CHIPClientCallbacks.h"
 #import "gen/CHIPClustersObjc.h"
+#import "gen/CHIPClientCallbacks.h"
 
 #include <controller/CHIPClusters.h>
 #include <lib/support/Span.h>
@@ -105,17 +105,19 @@ static void CallbackFn(void * context, chip::ByteSpan value)
         CHIPStringAttributeCallbackBridge * callback = reinterpret_cast<CHIPStringAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                if (callback->mOctetString) {
-                    NSData * data = [NSData dataWithBytes:value.data() length:value.size()];
-                    callback->mHandler(nil, @ { @"value" : data });
-                } else {
-                    NSString * str = [[NSString alloc] initWithBytes:value.data()
-                                                              length:value.size()
-                                                            encoding:NSUTF8StringEncoding];
-                    callback->mHandler(nil, @ { @"value" : str });
+                if (callback->mOctetString)
+                {
+                    NSData *data = [NSData dataWithBytes: value.data() length: value.size()];
+                    callback->mHandler(nil, @{ @"value": data });
+                }
+                else
+                {
+                    NSString * str = [[NSString alloc] initWithBytes:value.data() length:value.size() encoding:NSUTF8StringEncoding];
+                    callback->mHandler(nil, @{ @"value": str });
                 }
 
-                if (!callback->mKeepAlive) {
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -147,8 +149,9 @@ static void CallbackFn(void * context, bool value)
         CHIPBooleanAttributeCallbackBridge * callback = reinterpret_cast<CHIPBooleanAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithBool:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithBool:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -179,8 +182,9 @@ static void CallbackFn(void * context, uint8_t value)
         CHIPInt8uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt8uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedChar:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedChar:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -211,8 +215,9 @@ static void CallbackFn(void * context, int8_t value)
         CHIPInt8sAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt8sAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithChar:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithChar:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -243,8 +248,9 @@ static void CallbackFn(void * context, uint16_t value)
         CHIPInt16uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt16uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedShort:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedShort:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -275,8 +281,9 @@ static void CallbackFn(void * context, uint32_t value)
         CHIPInt32uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt32uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedLong:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedLong:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -307,8 +314,9 @@ static void CallbackFn(void * context, uint64_t value)
         CHIPInt64uAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt64uAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithUnsignedLongLong:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithUnsignedLongLong:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -339,8 +347,9 @@ static void CallbackFn(void * context, int16_t value)
         CHIPInt16sAttributeCallbackBridge * callback = reinterpret_cast<CHIPInt16sAttributeCallbackBridge *>(context);
         if (callback && callback->mQueue) {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ { @"value" : [NSNumber numberWithShort:value] });
-                if (!callback->mKeepAlive) {
+                callback->mHandler(nil, @{ @"value": [NSNumber numberWithShort:value] });
+                if (!callback->mKeepAlive)
+                {
                     callback->Cancel();
                     delete callback;
                 }
@@ -354,25 +363,21 @@ static void CallbackFn(void * context, int16_t value)
     bool mKeepAlive;
 };
 
-class CHIPDoorLockClusterClearAllPinsResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback> {
+class CHIPDoorLockClusterClearAllPinsResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearAllPinsResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -384,25 +389,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback> {
+class CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -414,25 +415,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback> {
+class CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -444,24 +441,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearPinResponseCallback> {
+class CHIPDoorLockClusterClearPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearPinResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearPinResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearPinResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearPinResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -473,24 +467,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearRfidResponseCallback> {
+class CHIPDoorLockClusterClearRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearRfidResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearRfidResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearRfidResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearRfidResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -502,25 +493,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback> {
+class CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -532,25 +519,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback> {
+class CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -562,31 +545,25 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback> {
+class CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge() {};
 
-    static void CallbackFn(
-        void * context, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+    static void CallbackFn(void * context, uint8_t scheduleId, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
     {
-        CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"scheduleId" : [NSNumber numberWithUnsignedChar:scheduleId],
-                    @"localStartTime" : [NSNumber numberWithUnsignedLong:localStartTime],
-                    @"localEndTime" : [NSNumber numberWithUnsignedLong:localEndTime],
-                    @"operatingModeDuringHoliday" : [NSNumber numberWithUnsignedChar:operatingModeDuringHoliday],
-                });
+                callback->mHandler(nil, @{
+                  @"scheduleId": [NSNumber numberWithUnsignedChar:scheduleId],
+                                    @"localStartTime": [NSNumber numberWithUnsignedLong:localStartTime],
+                                    @"localEndTime": [NSNumber numberWithUnsignedLong:localEndTime],
+                                    @"operatingModeDuringHoliday": [NSNumber numberWithUnsignedChar:operatingModeDuringHoliday],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -598,33 +575,27 @@ static void CallbackFn(
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetLogRecordResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetLogRecordResponseCallback> {
+class CHIPDoorLockClusterGetLogRecordResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetLogRecordResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
+    static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
     {
-        CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"logEntryId" : [NSNumber numberWithUnsignedShort:logEntryId],
-                    @"timestamp" : [NSNumber numberWithUnsignedLong:timestamp],
-                    @"eventType" : [NSNumber numberWithUnsignedChar:eventType],
-                    @"source" : [NSNumber numberWithUnsignedChar:source],
-                    @"eventIdOrAlarmCode" : [NSNumber numberWithUnsignedChar:eventIdOrAlarmCode],
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"pin" : [NSString stringWithFormat:@"%s", pin],
+                callback->mHandler(nil, @{
+                  @"logEntryId": [NSNumber numberWithUnsignedShort:logEntryId],
+                                    @"timestamp": [NSNumber numberWithUnsignedLong:timestamp],
+                                    @"eventType": [NSNumber numberWithUnsignedChar:eventType],
+                                    @"source": [NSNumber numberWithUnsignedChar:source],
+                                    @"eventIdOrAlarmCode": [NSNumber numberWithUnsignedChar:eventIdOrAlarmCode],
+                                    @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"pin": [NSString stringWithFormat:@"%s", pin],
                 });
                 callback->Cancel();
                 delete callback;
@@ -637,28 +608,24 @@ static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp,
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetPinResponseCallback> {
+class CHIPDoorLockClusterGetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetPinResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetPinResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin)
     {
-        CHIPDoorLockClusterGetPinResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetPinResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"userStatus" : [NSNumber numberWithUnsignedChar:userStatus],
-                    @"userType" : [NSNumber numberWithUnsignedChar:userType],
-                    @"pin" : [NSString stringWithFormat:@"%s", pin],
+                callback->mHandler(nil, @{
+                  @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"userStatus": [NSNumber numberWithUnsignedChar:userStatus],
+                                    @"userType": [NSNumber numberWithUnsignedChar:userType],
+                                    @"pin": [NSString stringWithFormat:@"%s", pin],
                 });
                 callback->Cancel();
                 delete callback;
@@ -671,28 +638,24 @@ static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetRfidResponseCallback> {
+class CHIPDoorLockClusterGetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetRfidResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetRfidResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid)
     {
-        CHIPDoorLockClusterGetRfidResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetRfidResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"userStatus" : [NSNumber numberWithUnsignedChar:userStatus],
-                    @"userType" : [NSNumber numberWithUnsignedChar:userType],
-                    @"rfid" : [NSString stringWithFormat:@"%s", rfid],
+                callback->mHandler(nil, @{
+                  @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"userStatus": [NSNumber numberWithUnsignedChar:userStatus],
+                                    @"userType": [NSNumber numberWithUnsignedChar:userType],
+                                    @"rfid": [NSString stringWithFormat:@"%s", rfid],
                 });
                 callback->Cancel();
                 delete callback;
@@ -705,27 +668,23 @@ static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetUserTypeResponseCallback> {
+class CHIPDoorLockClusterGetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetUserTypeResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
     {
-        CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"userType" : [NSNumber numberWithUnsignedChar:userType],
-                });
+                callback->mHandler(nil, @{
+                  @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"userType": [NSNumber numberWithUnsignedChar:userType],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -737,34 +696,28 @@ static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback> {
+class CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour,
-        uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
     {
-        CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"scheduleId" : [NSNumber numberWithUnsignedChar:scheduleId],
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"daysMask" : [NSNumber numberWithUnsignedChar:daysMask],
-                    @"startHour" : [NSNumber numberWithUnsignedChar:startHour],
-                    @"startMinute" : [NSNumber numberWithUnsignedChar:startMinute],
-                    @"endHour" : [NSNumber numberWithUnsignedChar:endHour],
-                    @"endMinute" : [NSNumber numberWithUnsignedChar:endMinute],
-                });
+                callback->mHandler(nil, @{
+                  @"scheduleId": [NSNumber numberWithUnsignedChar:scheduleId],
+                                    @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"daysMask": [NSNumber numberWithUnsignedChar:daysMask],
+                                    @"startHour": [NSNumber numberWithUnsignedChar:startHour],
+                                    @"startMinute": [NSNumber numberWithUnsignedChar:startMinute],
+                                    @"endHour": [NSNumber numberWithUnsignedChar:endHour],
+                                    @"endMinute": [NSNumber numberWithUnsignedChar:endMinute],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -776,30 +729,25 @@ static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback> {
+class CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint32_t localStartTime, uint32_t localEndTime)
     {
-        CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"scheduleId" : [NSNumber numberWithUnsignedChar:scheduleId],
-                    @"userId" : [NSNumber numberWithUnsignedShort:userId],
-                    @"localStartTime" : [NSNumber numberWithUnsignedLong:localStartTime],
-                    @"localEndTime" : [NSNumber numberWithUnsignedLong:localEndTime],
-                });
+                callback->mHandler(nil, @{
+                  @"scheduleId": [NSNumber numberWithUnsignedChar:scheduleId],
+                                    @"userId": [NSNumber numberWithUnsignedShort:userId],
+                                    @"localStartTime": [NSNumber numberWithUnsignedLong:localStartTime],
+                                    @"localEndTime": [NSNumber numberWithUnsignedLong:localEndTime],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -811,24 +759,21 @@ static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterLockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterLockDoorResponseCallback> {
+class CHIPDoorLockClusterLockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterLockDoorResponseCallback>
+{
 public:
-    CHIPDoorLockClusterLockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterLockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterLockDoorResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterLockDoorResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterLockDoorResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -840,25 +785,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback> {
+class CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -870,24 +811,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetPinResponseCallback> {
+class CHIPDoorLockClusterSetPinResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetPinResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetPinResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetPinResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetPinResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetPinResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -899,24 +837,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetRfidResponseCallback> {
+class CHIPDoorLockClusterSetRfidResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetRfidResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetRfidResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetRfidResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetRfidResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetRfidResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -928,24 +863,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetUserTypeResponseCallback> {
+class CHIPDoorLockClusterSetUserTypeResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetUserTypeResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -957,25 +889,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback> {
+class CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -987,25 +915,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback> {
+class CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>
+{
 public:
-    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -1017,24 +941,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterUnlockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback> {
+class CHIPDoorLockClusterUnlockDoorResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>
+{
 public:
-    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterUnlockDoorResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -1046,25 +967,21 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge
-    : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback> {
+class CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>
+{
 public:
-    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge() {};
 
     static void CallbackFn(void * context)
     {
-        CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * callback = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {});
+                callback->mHandler(nil, @{
+                });
                 callback->Cancel();
                 delete callback;
             });
@@ -1076,27 +993,22 @@ static void CallbackFn(void * context)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge
-    : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback> {
+class CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>
+{
 public:
-    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * callback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"errorCode" : [NSNumber numberWithUnsignedChar:errorCode],
-                    @"debugText" : [NSString stringWithFormat:@"%s", debugText],
+                callback->mHandler(nil, @{
+                  @"errorCode": [NSNumber numberWithUnsignedChar:errorCode],
+                                    @"debugText": [NSString stringWithFormat:@"%s", debugText],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1109,27 +1021,22 @@ static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge
-    : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback> {
+class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>
+{
 public:
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * callback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"errorCode" : [NSNumber numberWithUnsignedChar:errorCode],
-                    @"debugText" : [NSString stringWithFormat:@"%s", debugText],
+                callback->mHandler(nil, @{
+                  @"errorCode": [NSNumber numberWithUnsignedChar:errorCode],
+                                    @"debugText": [NSString stringWithFormat:@"%s", debugText],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1142,27 +1049,22 @@ static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge
-    : public Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback> {
+class CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge : public Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>
+{
 public:
-    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GeneralCommissioningClusterSetFabricResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     {
-        CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * callback = reinterpret_cast<CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"errorCode" : [NSNumber numberWithUnsignedChar:errorCode],
-                    @"debugText" : [NSString stringWithFormat:@"%s", debugText],
+                callback->mHandler(nil, @{
+                  @"errorCode": [NSNumber numberWithUnsignedChar:errorCode],
+                                    @"debugText": [NSString stringWithFormat:@"%s", debugText],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1175,26 +1077,22 @@ static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterAddGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterAddGroupResponseCallback> {
+class CHIPGroupsClusterAddGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterAddGroupResponseCallback>
+{
 public:
-    CHIPGroupsClusterAddGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterAddGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterAddGroupResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId)
     {
-        CHIPGroupsClusterAddGroupResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterAddGroupResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1206,30 +1104,24 @@ static void CallbackFn(void * context, uint16_t groupId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge
-    : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback> {
+class CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>
+{
 public:
-    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge() {};
 
-    static void CallbackFn(
-        void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
+    static void CallbackFn(void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList)
     {
-        CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"capacity" : [NSNumber numberWithUnsignedChar:capacity],
-                    @"groupCount" : [NSNumber numberWithUnsignedChar:groupCount],
-                    // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
-                    // Conversion from this type to Objc is not properly implemented yet
+                callback->mHandler(nil, @{
+                  @"capacity": [NSNumber numberWithUnsignedChar:capacity],
+                                    @"groupCount": [NSNumber numberWithUnsignedChar:groupCount],
+                                    // groupList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                  // Conversion from this type to Objc is not properly implemented yet
                 });
                 callback->Cancel();
                 delete callback;
@@ -1242,26 +1134,22 @@ static void CallbackFn(
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterRemoveGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback> {
+class CHIPGroupsClusterRemoveGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback>
+{
 public:
-    CHIPGroupsClusterRemoveGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterRemoveGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterRemoveGroupResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId)
     {
-        CHIPGroupsClusterRemoveGroupResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterRemoveGroupResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1273,26 +1161,22 @@ static void CallbackFn(void * context, uint16_t groupId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPGroupsClusterViewGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterViewGroupResponseCallback> {
+class CHIPGroupsClusterViewGroupResponseCallbackBridge : public Callback::Callback<GroupsClusterViewGroupResponseCallback>
+{
 public:
-    CHIPGroupsClusterViewGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPGroupsClusterViewGroupResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPGroupsClusterViewGroupResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t * groupName)
     {
-        CHIPGroupsClusterViewGroupResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPGroupsClusterViewGroupResponseCallbackBridge * callback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"groupName" : [NSString stringWithFormat:@"%s", groupName],
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"groupName": [NSString stringWithFormat:@"%s", groupName],
                 });
                 callback->Cancel();
                 delete callback;
@@ -1305,27 +1189,22 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t * groupName)
     dispatch_queue_t mQueue;
 };
 
-class CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge
-    : public Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback> {
+class CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge : public Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>
+{
 public:
-    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t timeout)
     {
-        CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * callback = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"timeout" : [NSNumber numberWithUnsignedShort:timeout],
-                });
+                callback->mHandler(nil, @{
+                  @"timeout": [NSNumber numberWithUnsignedShort:timeout],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1337,27 +1216,23 @@ static void CallbackFn(void * context, uint16_t timeout)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterAddSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterAddSceneResponseCallback> {
+class CHIPScenesClusterAddSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterAddSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterAddSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterAddSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterAddSceneResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     {
-        CHIPScenesClusterAddSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterAddSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1369,31 +1244,25 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterGetSceneMembershipResponseCallbackBridge
-    : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback> {
+class CHIPScenesClusterGetSceneMembershipResponseCallbackBridge : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>
+{
 public:
-    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterGetSceneMembershipResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-        /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
+    static void CallbackFn(void * context, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList)
     {
-        CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"capacity" : [NSNumber numberWithUnsignedChar:capacity],
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneCount" : [NSNumber numberWithUnsignedChar:sceneCount],
-                    // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
-                    // Conversion from this type to Objc is not properly implemented yet
+                callback->mHandler(nil, @{
+                  @"capacity": [NSNumber numberWithUnsignedChar:capacity],
+                                    @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneCount": [NSNumber numberWithUnsignedChar:sceneCount],
+                                    // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                  // Conversion from this type to Objc is not properly implemented yet
                 });
                 callback->Cancel();
                 delete callback;
@@ -1406,27 +1275,22 @@ static void CallbackFn(void * context, uint8_t capacity, uint16_t groupId, uint8
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterRemoveAllScenesResponseCallbackBridge
-    : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback> {
+class CHIPScenesClusterRemoveAllScenesResponseCallbackBridge : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>
+{
 public:
-    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterRemoveAllScenesResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId)
     {
-        CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1438,27 +1302,23 @@ static void CallbackFn(void * context, uint16_t groupId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterRemoveSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback> {
+class CHIPScenesClusterRemoveSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterRemoveSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterRemoveSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterRemoveSceneResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     {
-        CHIPScenesClusterRemoveSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterRemoveSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1470,27 +1330,23 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterStoreSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterStoreSceneResponseCallback> {
+class CHIPScenesClusterStoreSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterStoreSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterStoreSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterStoreSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterStoreSceneResponseCallbackBridge() {};
 
     static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     {
-        CHIPScenesClusterStoreSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterStoreSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                });
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                  });
                 callback->Cancel();
                 delete callback;
             });
@@ -1502,31 +1358,26 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId)
     dispatch_queue_t mQueue;
 };
 
-class CHIPScenesClusterViewSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterViewSceneResponseCallback> {
+class CHIPScenesClusterViewSceneResponseCallbackBridge : public Callback::Callback<ScenesClusterViewSceneResponseCallback>
+{
 public:
-    CHIPScenesClusterViewSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue)
-        : Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this)
-        , mHandler(handler)
-        , mQueue(queue)
-    {
-    }
+    CHIPScenesClusterViewSceneResponseCallbackBridge(ResponseHandler handler, dispatch_queue_t queue): Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this), mHandler(handler), mQueue(queue) {}
 
     ~CHIPScenesClusterViewSceneResponseCallbackBridge() {};
 
-    static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
-        /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
+    static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
     {
-        CHIPScenesClusterViewSceneResponseCallbackBridge * callback
-            = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallbackBridge *>(context);
-        if (callback && callback->mQueue) {
+        CHIPScenesClusterViewSceneResponseCallbackBridge * callback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallbackBridge *>(context);
+        if (callback && callback->mQueue)
+        {
             dispatch_async(callback->mQueue, ^{
-                callback->mHandler(nil, @ {
-                    @"groupId" : [NSNumber numberWithUnsignedShort:groupId],
-                    @"sceneId" : [NSNumber numberWithUnsignedChar:sceneId],
-                    @"transitionTime" : [NSNumber numberWithUnsignedShort:transitionTime],
-                    @"sceneName" : [NSString stringWithFormat:@"%s", sceneName],
-                    // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
-                    // Conversion from this type to Objc is not properly implemented yet
+                callback->mHandler(nil, @{
+                  @"groupId": [NSNumber numberWithUnsignedShort:groupId],
+                                    @"sceneId": [NSNumber numberWithUnsignedChar:sceneId],
+                                    @"transitionTime": [NSNumber numberWithUnsignedShort:transitionTime],
+                                    @"sceneName": [NSString stringWithFormat:@"%s", sceneName],
+                  // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                  // Conversion from this type to Objc is not properly implemented yet
                 });
                 callback->Cancel();
                 delete callback;
@@ -1539,6 +1390,7 @@ static void CallbackFn(void * context, uint16_t groupId, uint8_t sceneId, uint16
     dispatch_queue_t mQueue;
 };
 
+
 @interface CHIPCluster ()
 @property (readonly, nonatomic) dispatch_queue_t callbackQueue;
 - (Controller::ClusterBase *)getCluster;
@@ -1549,7 +1401,8 @@ - (instancetype)initWithDevice:(CHIPDevice *)device endpoint:(EndpointId)endpoin
 {
     if (self = [super init]) {
         Controller::ClusterBase * cppCluster = [self getCluster];
-        if (cppCluster == nullptr) {
+        if (cppCluster == nullptr)
+        {
             return nil;
         }
 
@@ -1569,6 +1422,8 @@ - (instancetype)initWithDevice:(CHIPDevice *)device endpoint:(EndpointId)endpoin
 }
 @end
 
+
+
 @interface CHIPApplicationBasic ()
 @property (readonly) Controller::ApplicationBasicCluster cppCluster;
 @end
@@ -1580,10 +1435,10 @@ @implementation CHIPApplicationBasic
     return &_cppCluster;
 }
 
+
 - (void)readAttributeVendorName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -1629,8 +1484,7 @@ - (void)readAttributeVendorId:(ResponseHandler)completionHandler
 
 - (void)readAttributeApplicationName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -1676,8 +1530,7 @@ - (void)readAttributeProductId:(ResponseHandler)completionHandler
 
 - (void)readAttributeApplicationId:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -1767,8 +1620,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPBarrierControl ()
 @property (readonly) Controller::BarrierControlCluster cppCluster;
 @end
@@ -1940,8 +1795,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPBasic ()
 @property (readonly) Controller::BasicCluster cppCluster;
 @end
@@ -2001,8 +1858,7 @@ - (void)readAttributeInteractionModelVersion:(ResponseHandler)completionHandler
 
 - (void)readAttributeVendorName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2048,8 +1904,7 @@ - (void)readAttributeVendorID:(ResponseHandler)completionHandler
 
 - (void)readAttributeProductName:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2095,8 +1950,7 @@ - (void)readAttributeProductID:(ResponseHandler)completionHandler
 
 - (void)readAttributeUserLabel:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2133,8 +1987,7 @@ - (void)writeAttributeUserLabel:(NSString *)value completionHandler:(ResponseHan
     }
 
     NSData * data = [value dataUsingEncoding:NSUTF8StringEncoding];
-    CHIP_ERROR err = self.cppCluster.WriteAttributeUserLabel(
-        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) data.bytes, data.length));
+    CHIP_ERROR err = self.cppCluster.WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)data.bytes, data.length));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2144,8 +1997,7 @@ - (void)writeAttributeUserLabel:(NSString *)value completionHandler:(ResponseHan
 
 - (void)readAttributeLocation:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2182,8 +2034,7 @@ - (void)writeAttributeLocation:(NSString *)value completionHandler:(ResponseHand
     }
 
     NSData * data = [value dataUsingEncoding:NSUTF8StringEncoding];
-    CHIP_ERROR err = self.cppCluster.WriteAttributeLocation(
-        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) data.bytes, data.length));
+    CHIP_ERROR err = self.cppCluster.WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)data.bytes, data.length));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2216,8 +2067,7 @@ - (void)readAttributeHardwareVersion:(ResponseHandler)completionHandler
 
 - (void)readAttributeHardwareVersionString:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2263,8 +2113,7 @@ - (void)readAttributeSoftwareVersion:(ResponseHandler)completionHandler
 
 - (void)readAttributeSoftwareVersionString:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -2308,8 +2157,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPBinding ()
 @property (readonly) Controller::BindingCluster cppCluster;
 @end
@@ -2321,11 +2172,7 @@ @implementation CHIPBinding
     return &_cppCluster;
 }
 
-- (void)bind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler
+- (void)bind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2347,11 +2194,7 @@ - (void)bind:(uint64_t)nodeId
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)unbind:(uint64_t)nodeId
-              groupId:(uint16_t)groupId
-           endpointId:(uint8_t)endpointId
-            clusterId:(uint16_t)clusterId
-    completionHandler:(ResponseHandler)completionHandler
+- (void)unbind:(uint64_t)nodeId groupId:(uint16_t)groupId endpointId:(uint8_t)endpointId clusterId:(uint16_t)clusterId completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2397,8 +2240,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPColorControl ()
 @property (readonly) Controller::ColorControlCluster cppCluster;
 @end
@@ -2410,11 +2255,7 @@ @implementation CHIPColorControl
     return &_cppCluster;
 }
 
-- (void)moveColor:(int16_t)rateX
-                rateY:(int16_t)rateY
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveColor:(int16_t)rateX rateY:(int16_t)rateY optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2429,21 +2270,14 @@ - (void)moveColor:(int16_t)rateX
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveColorTemperature:(uint8_t)moveMode
-                        rate:(uint16_t)rate
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler
+- (void)moveColorTemperature:(uint8_t)moveMode rate:(uint16_t)rate colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2458,19 +2292,14 @@ - (void)moveColorTemperature:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate,
-        colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveHue:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveHue:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2485,19 +2314,14 @@ - (void)moveHue:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveHue(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveHue(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveSaturation:(uint8_t)moveMode
-                  rate:(uint8_t)rate
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler
+- (void)moveSaturation:(uint8_t)moveMode rate:(uint8_t)rate optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2512,20 +2336,14 @@ - (void)moveSaturation:(uint8_t)moveMode
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveSaturation(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveSaturation(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToColor:(uint16_t)colorX
-               colorY:(uint16_t)colorY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToColor:(uint16_t)colorX colorY:(uint16_t)colorY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2540,19 +2358,14 @@ - (void)moveToColor:(uint16_t)colorX
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToColor(
-        onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToColor(onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToColorTemperature:(uint16_t)colorTemperature
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler
+- (void)moveToColorTemperature:(uint16_t)colorTemperature transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2567,20 +2380,14 @@ - (void)moveToColorTemperature:(uint16_t)colorTemperature
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToColorTemperature(
-        onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToHue:(uint8_t)hue
-            direction:(uint8_t)direction
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToHue:(uint8_t)hue direction:(uint8_t)direction transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2595,20 +2402,14 @@ - (void)moveToHue:(uint8_t)hue
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToHue(
-        onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToHueAndSaturation:(uint8_t)hue
-                    saturation:(uint8_t)saturation
-                transitionTime:(uint16_t)transitionTime
-                   optionsMask:(uint8_t)optionsMask
-               optionsOverride:(uint8_t)optionsOverride
-             completionHandler:(ResponseHandler)completionHandler
+- (void)moveToHueAndSaturation:(uint8_t)hue saturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2623,19 +2424,14 @@ - (void)moveToHueAndSaturation:(uint8_t)hue
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToHueAndSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToSaturation:(uint8_t)saturation
-          transitionTime:(uint16_t)transitionTime
-             optionsMask:(uint8_t)optionsMask
-         optionsOverride:(uint8_t)optionsOverride
-       completionHandler:(ResponseHandler)completionHandler
+- (void)moveToSaturation:(uint8_t)saturation transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2650,20 +2446,14 @@ - (void)moveToSaturation:(uint8_t)saturation
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.MoveToSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToSaturation(onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepColor:(int16_t)stepX
-                stepY:(int16_t)stepY
-       transitionTime:(uint16_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepColor:(int16_t)stepX stepY:(int16_t)stepY transitionTime:(uint16_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2678,22 +2468,14 @@ - (void)stepColor:(int16_t)stepX
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepColor(
-        onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepColor(onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepColorTemperature:(uint8_t)stepMode
-                    stepSize:(uint16_t)stepSize
-              transitionTime:(uint16_t)transitionTime
-     colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum
-     colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum
-                 optionsMask:(uint8_t)optionsMask
-             optionsOverride:(uint8_t)optionsOverride
-           completionHandler:(ResponseHandler)completionHandler
+- (void)stepColorTemperature:(uint8_t)stepMode stepSize:(uint16_t)stepSize transitionTime:(uint16_t)transitionTime colorTemperatureMinimum:(uint16_t)colorTemperatureMinimum colorTemperatureMaximum:(uint16_t)colorTemperatureMaximum optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2708,20 +2490,14 @@ - (void)stepColorTemperature:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize,
-        transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepHue:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint8_t)transitionTime
-          optionsMask:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepHue:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2736,20 +2512,14 @@ - (void)stepHue:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepHue(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepSaturation:(uint8_t)stepMode
-              stepSize:(uint8_t)stepSize
-        transitionTime:(uint8_t)transitionTime
-           optionsMask:(uint8_t)optionsMask
-       optionsOverride:(uint8_t)optionsOverride
-     completionHandler:(ResponseHandler)completionHandler
+- (void)stepSaturation:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint8_t)transitionTime optionsMask:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2764,17 +2534,14 @@ - (void)stepSaturation:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.StepSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    CHIP_ERROR err = self.cppCluster.StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stopMoveStep:(uint8_t)optionsMask
-      optionsOverride:(uint8_t)optionsOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stopMoveStep:(uint8_t)optionsMask optionsOverride:(uint8_t)optionsOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2820,10 +2587,7 @@ - (void)readAttributeCurrentHue:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentHue:(uint16_t)minInterval
-                         maxInterval:(uint16_t)maxInterval
-                              change:(uint8_t)change
-                   completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentHue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2838,8 +2602,8 @@ - (void)configureAttributeCurrentHue:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2847,7 +2611,7 @@ - (void)configureAttributeCurrentHue:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentHue:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentHue:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -2885,10 +2649,7 @@ - (void)readAttributeCurrentSaturation:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
-                                maxInterval:(uint16_t)maxInterval
-                                     change:(uint8_t)change
-                          completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentSaturation:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2903,8 +2664,8 @@ - (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentSaturation(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -2912,7 +2673,7 @@ - (void)configureAttributeCurrentSaturation:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentSaturation:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentSaturation:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -2973,10 +2734,7 @@ - (void)readAttributeCurrentX:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentX:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentX:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -2991,8 +2749,8 @@ - (void)configureAttributeCurrentX:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3000,7 +2758,7 @@ - (void)configureAttributeCurrentX:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentX:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentX:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -3038,10 +2796,7 @@ - (void)readAttributeCurrentY:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentY:(uint16_t)minInterval
-                       maxInterval:(uint16_t)maxInterval
-                            change:(uint16_t)change
-                 completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentY:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3056,8 +2811,8 @@ - (void)configureAttributeCurrentY:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3065,7 +2820,7 @@ - (void)configureAttributeCurrentY:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentY:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentY:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -3105,8 +2860,7 @@ - (void)readAttributeDriftCompensation:(ResponseHandler)completionHandler
 
 - (void)readAttributeCompensationText:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], false);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],false);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -3150,10 +2904,7 @@ - (void)readAttributeColorTemperature:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeColorTemperature:(uint16_t)minInterval
-                               maxInterval:(uint16_t)maxInterval
-                                    change:(uint16_t)change
-                         completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeColorTemperature:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -3168,8 +2919,8 @@ - (void)configureAttributeColorTemperature:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeColorTemperature(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -3177,7 +2928,7 @@ - (void)configureAttributeColorTemperature:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeColorTemperature:(ResponseHandler)reportHandler
+- (void) reportAttributeColorTemperature:(ResponseHandler)reportHandler
 {
     CHIPInt16uAttributeCallbackBridge * onReport = new CHIPInt16uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -3254,7 +3005,7 @@ - (void)writeAttributeColorControlOptions:(uint8_t)value completionHandler:(Resp
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorControlOptions(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3737,7 +3488,7 @@ - (void)writeAttributeWhitePointX:(uint16_t)value completionHandler:(ResponseHan
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeWhitePointX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3783,7 +3534,7 @@ - (void)writeAttributeWhitePointY:(uint16_t)value completionHandler:(ResponseHan
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeWhitePointY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3829,7 +3580,7 @@ - (void)writeAttributeColorPointRX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3875,7 +3626,7 @@ - (void)writeAttributeColorPointRY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3921,7 +3672,7 @@ - (void)writeAttributeColorPointRIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointRIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -3967,7 +3718,7 @@ - (void)writeAttributeColorPointGX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4013,7 +3764,7 @@ - (void)writeAttributeColorPointGY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4059,7 +3810,7 @@ - (void)writeAttributeColorPointGIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointGIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4105,7 +3856,7 @@ - (void)writeAttributeColorPointBX:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBX(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4151,7 +3902,7 @@ - (void)writeAttributeColorPointBY:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBY(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4197,7 +3948,7 @@ - (void)writeAttributeColorPointBIntensity:(uint8_t)value completionHandler:(Res
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeColorPointBIntensity(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4450,7 +4201,7 @@ - (void)writeAttributeStartUpColorTemperatureMireds:(uint16_t)value completionHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -4480,8 +4231,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPDoorLock ()
 @property (readonly) Controller::DoorLockCluster cppCluster;
 @end
@@ -4495,8 +4248,7 @@ @implementation CHIPDoorLock
 
 - (void)clearAllPins:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearAllPinsResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearAllPinsResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4518,8 +4270,7 @@ - (void)clearAllPins:(ResponseHandler)completionHandler
 }
 - (void)clearAllRfids:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearAllRfidsResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4541,8 +4292,7 @@ - (void)clearAllRfids:(ResponseHandler)completionHandler
 }
 - (void)clearHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4564,8 +4314,7 @@ - (void)clearHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHand
 }
 - (void)clearPin:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearPinResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearPinResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4587,8 +4336,7 @@ - (void)clearPin:(uint16_t)userId completionHandler:(ResponseHandler)completionH
 }
 - (void)clearRfid:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearRfidResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearRfidResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4610,8 +4358,7 @@ - (void)clearRfid:(uint16_t)userId completionHandler:(ResponseHandler)completion
 }
 - (void)clearWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4633,8 +4380,7 @@ - (void)clearWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId complet
 }
 - (void)clearYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterClearYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4656,8 +4402,7 @@ - (void)clearYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId complet
 }
 - (void)getHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4679,8 +4424,7 @@ - (void)getHolidaySchedule:(uint8_t)scheduleId completionHandler:(ResponseHandle
 }
 - (void)getLogRecord:(uint16_t)logIndex completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetLogRecordResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetLogRecordResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4702,8 +4446,7 @@ - (void)getLogRecord:(uint16_t)logIndex completionHandler:(ResponseHandler)compl
 }
 - (void)getPin:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetPinResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetPinResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4725,8 +4468,7 @@ - (void)getPin:(uint16_t)userId completionHandler:(ResponseHandler)completionHan
 }
 - (void)getRfid:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetRfidResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetRfidResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4748,8 +4490,7 @@ - (void)getRfid:(uint16_t)userId completionHandler:(ResponseHandler)completionHa
 }
 - (void)getUserType:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetUserTypeResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4771,8 +4512,7 @@ - (void)getUserType:(uint16_t)userId completionHandler:(ResponseHandler)completi
 }
 - (void)getWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4794,8 +4534,7 @@ - (void)getWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completio
 }
 - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterGetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4817,8 +4556,7 @@ - (void)getYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId completio
 }
 - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterLockDoorResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterLockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterLockDoorResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterLockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4831,23 +4569,16 @@ - (void)lockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHa
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.LockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.LockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setHolidaySchedule:(uint8_t)scheduleId
-                localStartTime:(uint32_t)localStartTime
-                  localEndTime:(uint32_t)localEndTime
-    operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday
-             completionHandler:(ResponseHandler)completionHandler
+- (void)setHolidaySchedule:(uint8_t)scheduleId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime operatingModeDuringHoliday:(uint8_t)operatingModeDuringHoliday completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetHolidayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4860,22 +4591,16 @@ - (void)setHolidaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetHolidaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+    CHIP_ERROR err = self.cppCluster.SetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setPin:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                  pin:(NSString *)pin
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setPin:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetPinResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetPinResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetPinResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4888,23 +4613,16 @@ - (void)setPin:(uint16_t)userId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setRfid:(uint16_t)userId
-           userStatus:(uint8_t)userStatus
-             userType:(uint8_t)userType
-                   id:(NSString *)id
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setRfid:(uint16_t)userId userStatus:(uint8_t)userStatus userType:(uint8_t)userType id:(NSString *)id completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetRfidResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetRfidResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetRfidResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4917,9 +4635,7 @@ - (void)setRfid:(uint16_t)userId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-        chip::ByteSpan((const uint8_t *) [id dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*)[id dataUsingEncoding:NSUTF8StringEncoding].bytes, [id lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -4928,8 +4644,7 @@ - (void)setRfid:(uint16_t)userId
 }
 - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetUserTypeResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetUserTypeResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4949,17 +4664,9 @@ - (void)setUserType:(uint16_t)userId userType:(uint8_t)userType completionHandle
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setWeekdaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-                  daysMask:(uint8_t)daysMask
-                 startHour:(uint8_t)startHour
-               startMinute:(uint8_t)startMinute
-                   endHour:(uint8_t)endHour
-                 endMinute:(uint8_t)endMinute
-         completionHandler:(ResponseHandler)completionHandler
+- (void)setWeekdaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId daysMask:(uint8_t)daysMask startHour:(uint8_t)startHour startMinute:(uint8_t)startMinute endHour:(uint8_t)endHour endMinute:(uint8_t)endMinute completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetWeekdayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -4972,22 +4679,16 @@ - (void)setWeekdaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetWeekdaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+    CHIP_ERROR err = self.cppCluster.SetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setYeardaySchedule:(uint8_t)scheduleId
-                    userId:(uint16_t)userId
-            localStartTime:(uint32_t)localStartTime
-              localEndTime:(uint32_t)localEndTime
-         completionHandler:(ResponseHandler)completionHandler
+- (void)setYeardaySchedule:(uint8_t)scheduleId userId:(uint16_t)userId localStartTime:(uint32_t)localStartTime localEndTime:(uint32_t)localEndTime completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterSetYeardayScheduleResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5000,8 +4701,7 @@ - (void)setYeardaySchedule:(uint8_t)scheduleId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetYeardaySchedule(
-        onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
+    CHIP_ERROR err = self.cppCluster.SetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5010,8 +4710,7 @@ - (void)setYeardaySchedule:(uint8_t)scheduleId
 }
 - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterUnlockDoorResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterUnlockDoorResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5024,9 +4723,7 @@ - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completion
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5035,8 +4732,7 @@ - (void)unlockDoor:(NSString *)pin completionHandler:(ResponseHandler)completion
 }
 - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * onSuccess
-        = new CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge * onSuccess = new CHIPDoorLockClusterUnlockWithTimeoutResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5049,9 +4745,7 @@ - (void)unlockWithTimeout:(uint16_t)timeoutInSeconds pin:(NSString *)pin complet
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds,
-        chip::ByteSpan((const uint8_t *) [pin dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds, chip::ByteSpan((const uint8_t*)[pin dataUsingEncoding:NSUTF8StringEncoding].bytes, [pin lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5082,9 +4776,7 @@ - (void)readAttributeLockState:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeLockState:(uint16_t)minInterval
-                        maxInterval:(uint16_t)maxInterval
-                  completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeLockState:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5099,8 +4791,8 @@ - (void)configureAttributeLockState:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ConfigureAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5108,7 +4800,7 @@ - (void)configureAttributeLockState:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeLockState:(ResponseHandler)reportHandler
+- (void) reportAttributeLockState:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -5148,8 +4840,7 @@ - (void)readAttributeLockType:(ResponseHandler)completionHandler
 
 - (void)readAttributeActuatorEnabled:(ResponseHandler)completionHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onSuccess
-        = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPBooleanAttributeCallbackBridge * onSuccess = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5193,8 +4884,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPGeneralCommissioning ()
 @property (readonly) Controller::GeneralCommissioningCluster cppCluster;
 @end
@@ -5206,13 +4899,9 @@ @implementation CHIPGeneralCommissioning
     return &_cppCluster;
 }
 
-- (void)armFailSafe:(uint16_t)expiryLengthSeconds
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler
+- (void)armFailSafe:(uint16_t)expiryLengthSeconds breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * onSuccess
-        = new CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge * onSuccess = new CHIPGeneralCommissioningClusterArmFailSafeResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5225,8 +4914,7 @@ - (void)armFailSafe:(uint16_t)expiryLengthSeconds
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.ArmFailSafe(onSuccess->Cancel(), onFailure->Cancel(), expiryLengthSeconds, breadcrumb, timeoutMs);
+    CHIP_ERROR err = self.cppCluster.ArmFailSafe(onSuccess->Cancel(), onFailure->Cancel(), expiryLengthSeconds, breadcrumb, timeoutMs);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5235,8 +4923,7 @@ - (void)armFailSafe:(uint16_t)expiryLengthSeconds
 }
 - (void)commissioningComplete:(ResponseHandler)completionHandler
 {
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * onSuccess
-        = new CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge * onSuccess = new CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5256,14 +4943,9 @@ - (void)commissioningComplete:(ResponseHandler)completionHandler
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)setFabric:(NSData *)fabricId
-         fabricSecret:(NSData *)fabricSecret
-           breadcrumb:(uint64_t)breadcrumb
-            timeoutMs:(uint32_t)timeoutMs
-    completionHandler:(ResponseHandler)completionHandler
+- (void)setFabric:(NSData *)fabricId fabricSecret:(NSData *)fabricSecret breadcrumb:(uint64_t)breadcrumb timeoutMs:(uint32_t)timeoutMs completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * onSuccess
-        = new CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge * onSuccess = new CHIPGeneralCommissioningClusterSetFabricResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5276,9 +4958,7 @@ - (void)setFabric:(NSData *)fabricId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.SetFabric(onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) fabricId.bytes, fabricId.length),
-        chip::ByteSpan((const uint8_t *) fabricSecret.bytes, fabricSecret.length), breadcrumb, timeoutMs);
+    CHIP_ERROR err = self.cppCluster.SetFabric(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*)fabricId.bytes, fabricId.length), chip::ByteSpan((const uint8_t*)fabricSecret.bytes, fabricSecret.length), breadcrumb, timeoutMs);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5288,8 +4968,7 @@ - (void)setFabric:(NSData *)fabricId
 
 - (void)readAttributeFabricId:(ResponseHandler)completionHandler
 {
-    CHIPStringAttributeCallbackBridge * onSuccess
-        = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue], true);
+    CHIPStringAttributeCallbackBridge * onSuccess = new CHIPStringAttributeCallbackBridge(completionHandler, [self callbackQueue],true);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5349,7 +5028,7 @@ - (void)writeAttributeBreadcrumb:(uint64_t)value completionHandler:(ResponseHand
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeBreadcrumb(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -5379,8 +5058,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPGroups ()
 @property (readonly) Controller::GroupsCluster cppCluster;
 @end
@@ -5394,8 +5075,7 @@ @implementation CHIPGroups
 
 - (void)addGroup:(uint16_t)groupId groupName:(NSString *)groupName completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterAddGroupResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterAddGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterAddGroupResponseCallbackBridge * onSuccess = new CHIPGroupsClusterAddGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5408,9 +5088,7 @@ - (void)addGroup:(uint16_t)groupId groupName:(NSString *)groupName completionHan
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-        chip::ByteSpan((const uint8_t *) [groupName dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::ByteSpan((const uint8_t*)[groupName dataUsingEncoding:NSUTF8StringEncoding].bytes, [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5432,9 +5110,7 @@ - (void)addGroupIfIdentifying:(uint16_t)groupId groupName:(NSString *)groupName
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-        chip::ByteSpan((const uint8_t *) [groupName dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
+    CHIP_ERROR err = self.cppCluster.AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::ByteSpan((const uint8_t*)[groupName dataUsingEncoding:NSUTF8StringEncoding].bytes, [groupName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]));
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5443,8 +5119,7 @@ - (void)addGroupIfIdentifying:(uint16_t)groupId groupName:(NSString *)groupName
 }
 - (void)getGroupMembership:(uint8_t)groupCount groupList:(uint16_t)groupList completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge * onSuccess = new CHIPGroupsClusterGetGroupMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5488,8 +5163,7 @@ - (void)removeAllGroups:(ResponseHandler)completionHandler
 }
 - (void)removeGroup:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterRemoveGroupResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterRemoveGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterRemoveGroupResponseCallbackBridge * onSuccess = new CHIPGroupsClusterRemoveGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5511,8 +5185,7 @@ - (void)removeGroup:(uint16_t)groupId completionHandler:(ResponseHandler)complet
 }
 - (void)viewGroup:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPGroupsClusterViewGroupResponseCallbackBridge * onSuccess
-        = new CHIPGroupsClusterViewGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPGroupsClusterViewGroupResponseCallbackBridge * onSuccess = new CHIPGroupsClusterViewGroupResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5579,8 +5252,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPIdentify ()
 @property (readonly) Controller::IdentifyCluster cppCluster;
 @end
@@ -5616,8 +5291,7 @@ - (void)identify:(uint16_t)identifyTime completionHandler:(ResponseHandler)compl
 }
 - (void)identifyQuery:(ResponseHandler)completionHandler
 {
-    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * onSuccess
-        = new CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge * onSuccess = new CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -5677,7 +5351,7 @@ - (void)writeAttributeIdentifyTime:(uint16_t)value completionHandler:(ResponseHa
     }
 
     CHIP_ERROR err = self.cppCluster.WriteAttributeIdentifyTime(onSuccess->Cancel(), onFailure->Cancel(), value);
-    if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
@@ -5707,8 +5381,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPLevelControl ()
 @property (readonly) Controller::LevelControlCluster cppCluster;
 @end
@@ -5720,11 +5396,7 @@ @implementation CHIPLevelControl
     return &_cppCluster;
 }
 
-- (void)move:(uint8_t)moveMode
-                 rate:(uint8_t)rate
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)move:(uint8_t)moveMode rate:(uint8_t)rate optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5746,11 +5418,7 @@ - (void)move:(uint8_t)moveMode
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToLevel:(uint8_t)level
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)moveToLevel:(uint8_t)level transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5765,17 +5433,14 @@ - (void)moveToLevel:(uint8_t)level
         return;
     }
 
-    CHIP_ERROR err
-        = self.cppCluster.MoveToLevel(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime, optionMask, optionOverride);
+    CHIP_ERROR err = self.cppCluster.MoveToLevel(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime, optionMask, optionOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)moveToLevelWithOnOff:(uint8_t)level
-              transitionTime:(uint16_t)transitionTime
-           completionHandler:(ResponseHandler)completionHandler
+- (void)moveToLevelWithOnOff:(uint8_t)level transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5819,12 +5484,7 @@ - (void)moveWithOnOff:(uint8_t)moveMode rate:(uint8_t)rate completionHandler:(Re
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)step:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-           optionMask:(uint8_t)optionMask
-       optionOverride:(uint8_t)optionOverride
-    completionHandler:(ResponseHandler)completionHandler
+- (void)step:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime optionMask:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5839,18 +5499,14 @@ - (void)step:(uint8_t)stepMode
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.Step(
-        onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
+    CHIP_ERROR err = self.cppCluster.Step(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)stepWithOnOff:(uint8_t)stepMode
-             stepSize:(uint8_t)stepSize
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler
+- (void)stepWithOnOff:(uint8_t)stepMode stepSize:(uint8_t)stepSize transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5940,10 +5596,7 @@ - (void)readAttributeCurrentLevel:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeCurrentLevel:(uint16_t)minInterval
-                           maxInterval:(uint16_t)maxInterval
-                                change:(uint8_t)change
-                     completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeCurrentLevel:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(uint8_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -5958,8 +5611,8 @@ - (void)configureAttributeCurrentLevel:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentLevel(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -5967,7 +5620,7 @@ - (void)configureAttributeCurrentLevel:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeCurrentLevel:(ResponseHandler)reportHandler
+- (void) reportAttributeCurrentLevel:(ResponseHandler)reportHandler
 {
     CHIPInt8uAttributeCallbackBridge * onReport = new CHIPInt8uAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -6005,8 +5658,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPLowPower ()
 @property (readonly) Controller::LowPowerCluster cppCluster;
 @end
@@ -6064,8 +5719,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPOnOff ()
 @property (readonly) Controller::OnOffCluster cppCluster;
 @end
@@ -6146,8 +5803,7 @@ - (void)toggle:(ResponseHandler)completionHandler
 
 - (void)readAttributeOnOff:(ResponseHandler)completionHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onSuccess
-        = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPBooleanAttributeCallbackBridge * onSuccess = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6168,9 +5824,7 @@ - (void)readAttributeOnOff:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeOnOff:(uint16_t)minInterval
-                    maxInterval:(uint16_t)maxInterval
-              completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeOnOff:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -6185,6 +5839,7 @@ - (void)configureAttributeOnOff:(uint16_t)minInterval
         return;
     }
 
+
     CHIP_ERROR err = self.cppCluster.ConfigureAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
@@ -6193,10 +5848,9 @@ - (void)configureAttributeOnOff:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeOnOff:(ResponseHandler)reportHandler
+- (void) reportAttributeOnOff:(ResponseHandler)reportHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onReport
-        = new CHIPBooleanAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
+    CHIPBooleanAttributeCallbackBridge * onReport = new CHIPBooleanAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
         reportHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6232,8 +5886,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPScenes ()
 @property (readonly) Controller::ScenesCluster cppCluster;
 @end
@@ -6245,17 +5901,9 @@ @implementation CHIPScenes
     return &_cppCluster;
 }
 
-- (void)addScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-            sceneName:(NSString *)sceneName
-            clusterId:(uint16_t)clusterId
-               length:(uint8_t)length
-                value:(uint8_t)value
-    completionHandler:(ResponseHandler)completionHandler
+- (void)addScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime sceneName:(NSString *)sceneName clusterId:(uint16_t)clusterId length:(uint8_t)length value:(uint8_t)value completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterAddSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterAddSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterAddSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterAddSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6268,10 +5916,7 @@ - (void)addScene:(uint16_t)groupId
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime,
-        chip::ByteSpan((const uint8_t *) [sceneName dataUsingEncoding:NSUTF8StringEncoding].bytes,
-            [sceneName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]),
-        clusterId, length, value);
+    CHIP_ERROR err = self.cppCluster.AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime, chip::ByteSpan((const uint8_t*)[sceneName dataUsingEncoding:NSUTF8StringEncoding].bytes, [sceneName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]), clusterId, length, value);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -6280,8 +5925,7 @@ - (void)addScene:(uint16_t)groupId
 }
 - (void)getSceneMembership:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterGetSceneMembershipResponseCallbackBridge * onSuccess = new CHIPScenesClusterGetSceneMembershipResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6301,10 +5945,7 @@ - (void)getSceneMembership:(uint16_t)groupId completionHandler:(ResponseHandler)
         completionHandler([CHIPError errorForCHIPErrorCode:err], nil);
     }
 }
-- (void)recallScene:(uint16_t)groupId
-              sceneId:(uint8_t)sceneId
-       transitionTime:(uint16_t)transitionTime
-    completionHandler:(ResponseHandler)completionHandler
+- (void)recallScene:(uint16_t)groupId sceneId:(uint8_t)sceneId transitionTime:(uint16_t)transitionTime completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -6328,8 +5969,7 @@ - (void)recallScene:(uint16_t)groupId
 }
 - (void)removeAllScenes:(uint16_t)groupId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterRemoveAllScenesResponseCallbackBridge * onSuccess = new CHIPScenesClusterRemoveAllScenesResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6351,8 +5991,7 @@ - (void)removeAllScenes:(uint16_t)groupId completionHandler:(ResponseHandler)com
 }
 - (void)removeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterRemoveSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterRemoveSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterRemoveSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterRemoveSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6374,8 +6013,7 @@ - (void)removeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler
 }
 - (void)storeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterStoreSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterStoreSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterStoreSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterStoreSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6397,8 +6035,7 @@ - (void)storeScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:
 }
 - (void)viewScene:(uint16_t)groupId sceneId:(uint8_t)sceneId completionHandler:(ResponseHandler)completionHandler
 {
-    CHIPScenesClusterViewSceneResponseCallbackBridge * onSuccess
-        = new CHIPScenesClusterViewSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPScenesClusterViewSceneResponseCallbackBridge * onSuccess = new CHIPScenesClusterViewSceneResponseCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6490,8 +6127,7 @@ - (void)readAttributeCurrentGroup:(ResponseHandler)completionHandler
 
 - (void)readAttributeSceneValid:(ResponseHandler)completionHandler
 {
-    CHIPBooleanAttributeCallbackBridge * onSuccess
-        = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
+    CHIPBooleanAttributeCallbackBridge * onSuccess = new CHIPBooleanAttributeCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
         completionHandler([CHIPError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE], nil);
         return;
@@ -6558,8 +6194,10 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
 
+
 @interface CHIPTemperatureMeasurement ()
 @property (readonly) Controller::TemperatureMeasurementCluster cppCluster;
 @end
@@ -6571,6 +6209,7 @@ @implementation CHIPTemperatureMeasurement
     return &_cppCluster;
 }
 
+
 - (void)readAttributeMeasuredValue:(ResponseHandler)completionHandler
 {
     CHIPInt16sAttributeCallbackBridge * onSuccess = new CHIPInt16sAttributeCallbackBridge(completionHandler, [self callbackQueue]);
@@ -6594,10 +6233,7 @@ - (void)readAttributeMeasuredValue:(ResponseHandler)completionHandler
     }
 }
 
-- (void)configureAttributeMeasuredValue:(uint16_t)minInterval
-                            maxInterval:(uint16_t)maxInterval
-                                 change:(int16_t)change
-                      completionHandler:(ResponseHandler)completionHandler
+- (void) configureAttributeMeasuredValue:(uint16_t)minInterval  maxInterval:(uint16_t)maxInterval change:(int16_t)change completionHandler:(ResponseHandler)completionHandler
 {
     CHIPDefaultSuccessCallbackBridge * onSuccess = new CHIPDefaultSuccessCallbackBridge(completionHandler, [self callbackQueue]);
     if (!onSuccess) {
@@ -6612,8 +6248,8 @@ - (void)configureAttributeMeasuredValue:(uint16_t)minInterval
         return;
     }
 
-    CHIP_ERROR err = self.cppCluster.ConfigureAttributeMeasuredValue(
-        onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
+
+    CHIP_ERROR err = self.cppCluster.ConfigureAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), minInterval, maxInterval, change);
     if (err != CHIP_NO_ERROR) {
         delete onSuccess;
         delete onFailure;
@@ -6621,7 +6257,7 @@ - (void)configureAttributeMeasuredValue:(uint16_t)minInterval
     }
 }
 
-- (void)reportAttributeMeasuredValue:(ResponseHandler)reportHandler
+- (void) reportAttributeMeasuredValue:(ResponseHandler)reportHandler
 {
     CHIPInt16sAttributeCallbackBridge * onReport = new CHIPInt16sAttributeCallbackBridge(reportHandler, [self callbackQueue], true);
     if (!onReport) {
@@ -6705,4 +6341,6 @@ - (void)readAttributeClusterRevision:(ResponseHandler)completionHandler
     }
 }
 
+
 @end
+
diff --git a/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp b/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp
index 8398b130687fdc..6ff41e78a53824 100644
--- a/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp
+++ b/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp
@@ -17,15 +17,15 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 #include <app/InteractionModelEngine.h>
 
@@ -47,1929 +47,1880 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_CLEAR_ALL_PINS_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearAllPinsResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllPinsResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearPinResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearPinResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearRfidResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearRfidResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint8_t status;
-            bool statusExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists = false;
-            uint8_t operatingModeDuringHoliday;
-            bool operatingModeDuringHolidayExists = false;
-            uint32_t validArgumentCount           = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (operatingModeDuringHolidayExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        operatingModeDuringHolidayExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime,
-                                                                         operatingModeDuringHoliday);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint8_t status;
+bool statusExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint8_t operatingModeDuringHoliday;
+bool operatingModeDuringHolidayExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (operatingModeDuringHolidayExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(operatingModeDuringHoliday);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            operatingModeDuringHolidayExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t logEntryId;
-            bool logEntryIdExists = false;
-            uint32_t timestamp;
-            bool timestampExists = false;
-            uint8_t eventType;
-            bool eventTypeExists = false;
-            uint8_t source;
-            bool sourceExists = false;
-            uint8_t eventIdOrAlarmCode;
-            bool eventIdOrAlarmCodeExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (logEntryIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(logEntryId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        logEntryIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (timestampExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timestamp);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timestampExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (eventTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(eventType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        eventTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (sourceExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(source);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sourceExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (eventIdOrAlarmCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(eventIdOrAlarmCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        eventIdOrAlarmCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode,
-                                                                   userId, const_cast<uint8_t *>(pin));
-            }
-            else if (7 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t logEntryId;
+bool logEntryIdExists = false;
+uint32_t timestamp;
+bool timestampExists = false;
+uint8_t eventType;
+bool eventTypeExists = false;
+uint8_t source;
+bool sourceExists = false;
+uint8_t eventIdOrAlarmCode;
+bool eventIdOrAlarmCodeExists = false;
+uint16_t userId;
+bool userIdExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (logEntryIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(logEntryId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            logEntryIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (timestampExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timestamp);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timestampExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (eventTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(eventType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            eventTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (sourceExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(source);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sourceExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (eventIdOrAlarmCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(eventIdOrAlarmCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            eventIdOrAlarmCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, const_cast<uint8_t*>(pin));
+        }
+else if (7 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 7, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_PIN_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * pin;
-            bool pinExists              = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (pinExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(pin);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        pinExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, const_cast<uint8_t *>(pin));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * pin;
+bool pinExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (pinExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(pin);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            pinExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, const_cast<uint8_t*>(pin));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_RFID_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userStatus;
-            bool userStatusExists = false;
-            uint8_t userType;
-            bool userTypeExists = false;
-            const uint8_t * rfid;
-            bool rfidExists             = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userStatusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userStatus);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userStatusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (rfidExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(rfid);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        rfidExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, const_cast<uint8_t *>(rfid));
-            }
-            else if (4 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userStatus;
+bool userStatusExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+const uint8_t * rfid;
+bool rfidExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userStatusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userStatus);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userStatusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (rfidExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(rfid);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            rfidExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, const_cast<uint8_t*>(rfid));
+        }
+else if (4 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 4, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t userType;
-            bool userTypeExists         = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userTypeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userType);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userTypeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t userType;
+bool userTypeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userTypeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userType);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userTypeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t status;
-            bool statusExists = false;
-            uint8_t daysMask;
-            bool daysMaskExists = false;
-            uint8_t startHour;
-            bool startHourExists = false;
-            uint8_t startMinute;
-            bool startMinuteExists = false;
-            uint8_t endHour;
-            bool endHourExists = false;
-            uint8_t endMinute;
-            bool endMinuteExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (daysMaskExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(daysMask);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        daysMaskExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (startHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (startMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(startMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        startMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 6:
-                    if (endHourExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endHour);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endHourExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 7:
-                    if (endMinuteExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(endMinute);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        endMinuteExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour,
-                                                                         startMinute, endHour, endMinute);
-            }
-            else if (8 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 8,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t status;
+bool statusExists = false;
+uint8_t daysMask;
+bool daysMaskExists = false;
+uint8_t startHour;
+bool startHourExists = false;
+uint8_t startMinute;
+bool startMinuteExists = false;
+uint8_t endHour;
+bool endHourExists = false;
+uint8_t endMinute;
+bool endMinuteExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (daysMaskExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(daysMask);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            daysMaskExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (startHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (startMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(startMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            startMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 6:
+      if (endHourExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endHour);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endHourExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 7:
+      if (endMinuteExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(endMinute);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            endMinuteExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, startMinute, endHour, endMinute);
+        }
+else if (8 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 8, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t scheduleId;
-            bool scheduleIdExists = false;
-            uint16_t userId;
-            bool userIdExists = false;
-            uint8_t status;
-            bool statusExists = false;
-            uint32_t localStartTime;
-            bool localStartTimeExists = false;
-            uint32_t localEndTime;
-            bool localEndTimeExists     = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (scheduleIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(scheduleId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        scheduleIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (userIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(userId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        userIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (localStartTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localStartTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localStartTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (localEndTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(localEndTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        localEndTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t scheduleId;
+bool scheduleIdExists = false;
+uint16_t userId;
+bool userIdExists = false;
+uint8_t status;
+bool statusExists = false;
+uint32_t localStartTime;
+bool localStartTimeExists = false;
+uint32_t localEndTime;
+bool localEndTimeExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (scheduleIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(scheduleId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            scheduleIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (userIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(userId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            userIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (localStartTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localStartTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localStartTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (localEndTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(localEndTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            localEndTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterLockDoorResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterLockDoorResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_PIN_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetPinResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetPinResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_RFID_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetRfidResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetRfidResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetUserTypeResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetUserTypeResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
+            break;
+        }
+        case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
-        case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
             break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockDoorResponseCallback(status);
         }
-        case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockDoorResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         case ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists           = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         default: {
@@ -1982,7 +1933,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace DoorLock
+}
 
 namespace GeneralCommissioning {
 
@@ -1992,247 +1943,240 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t errorCode;
-            bool errorCodeExists = false;
-            const uint8_t * debugText;
-            bool debugTextExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (errorCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(errorCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        errorCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (debugTextExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(debugText);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        debugTextExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, const_cast<uint8_t *>(debugText));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t errorCode;
+bool errorCodeExists = false;
+const uint8_t * debugText;
+bool debugTextExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (errorCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(errorCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            errorCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (debugTextExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(debugText);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            debugTextExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, const_cast<uint8_t*>(debugText));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t errorCode;
-            bool errorCodeExists = false;
-            const uint8_t * debugText;
-            bool debugTextExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (errorCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(errorCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        errorCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (debugTextExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(debugText);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        debugTextExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode,
-                                                                                        const_cast<uint8_t *>(debugText));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t errorCode;
+bool errorCodeExists = false;
+const uint8_t * debugText;
+bool debugTextExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (errorCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(errorCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            errorCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (debugTextExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(debugText);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            debugTextExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, const_cast<uint8_t*>(debugText));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_SET_FABRIC_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t errorCode;
-            bool errorCodeExists = false;
-            const uint8_t * debugText;
-            bool debugTextExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (errorCodeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(errorCode);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        errorCodeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (debugTextExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(debugText);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        debugTextExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, const_cast<uint8_t *>(debugText));
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t errorCode;
+bool errorCodeExists = false;
+const uint8_t * debugText;
+bool debugTextExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (errorCodeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(errorCode);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            errorCodeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (debugTextExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(debugText);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            debugTextExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, const_cast<uint8_t*>(debugText));
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         default: {
@@ -2245,7 +2189,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace GeneralCommissioning
+}
 
 namespace Groups {
 
@@ -2255,357 +2199,349 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_GROUP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t capacity;
-            bool capacityExists = false;
-            uint8_t groupCount;
-            bool groupCountExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
-            bool groupListExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (capacityExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(capacity);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        capacityExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupCountExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupCount);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupCountExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (groupListExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupListExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t capacity;
+bool capacityExists = false;
+uint8_t groupCount;
+bool groupCountExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
+bool groupListExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (capacityExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(capacity);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            capacityExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupCountExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupCount);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupCountExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (groupListExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(groupList));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupListExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            const uint8_t * groupName;
-            bool groupNameExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (groupNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(groupName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfGroupsClusterViewGroupResponseCallback(status, groupId, const_cast<uint8_t *>(groupName));
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+const uint8_t * groupName;
+bool groupNameExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (groupNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(groupName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfGroupsClusterViewGroupResponseCallback(status, groupId, const_cast<uint8_t*>(groupName));
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         default: {
@@ -2618,7 +2554,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Groups
+}
 
 namespace Identify {
 
@@ -2628,67 +2564,65 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint16_t timeout;
-            bool timeoutExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (timeoutExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(timeout);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        timeoutExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
-            }
-            else if (1 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint16_t timeout;
+bool timeoutExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (timeoutExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(timeout);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            timeoutExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
+        }
+else if (1 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 1, validArgumentCount);
+}
             break;
         }
         default: {
@@ -2701,7 +2635,7 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Identify
+}
 
 namespace Scenes {
 
@@ -2711,647 +2645,634 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
         switch (commandId)
         {
         case ZCL_ADD_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint8_t capacity;
-            bool capacityExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneCount;
-            bool sceneCountExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList;
-            bool sceneListExists        = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (capacityExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(capacity);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        capacityExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (sceneCountExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneCount);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneCountExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (sceneListExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(sceneList));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneListExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
-            }
-            else if (5 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint8_t capacity;
+bool capacityExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneCount;
+bool sceneCountExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  sceneList;
+bool sceneListExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (capacityExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(capacity);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            capacityExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (sceneCountExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneCount);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneCountExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (sceneListExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(sceneList));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneListExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
+        }
+else if (5 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 5, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
-            }
-            else if (2 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
+        }
+else if (2 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 2, validArgumentCount);
+}
             break;
         }
         case ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_STORE_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists          = false;
-            uint32_t validArgumentCount = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
-            }
-            else if (3 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
+        }
+else if (3 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 3, validArgumentCount);
+}
             break;
         }
         case ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID: {
-            // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
-            // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
-            // Any error value TLVUnpackError means we have received an illegal value.
-            CHIP_ERROR TLVError       = CHIP_NO_ERROR;
-            CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
-            uint8_t status;
-            bool statusExists = false;
-            uint16_t groupId;
-            bool groupIdExists = false;
-            uint8_t sceneId;
-            bool sceneIdExists = false;
-            uint16_t transitionTime;
-            bool transitionTimeExists = false;
-            const uint8_t * sceneName;
-            bool sceneNameExists = false;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-            bool extensionFieldSetsExists = false;
-            uint32_t validArgumentCount   = 0;
-
-            while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
-            {
-                switch (TLV::TagNumFromTag(dataTlv.GetTag()))
-                {
-                case 0:
-                    if (statusExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(status);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        statusExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 1:
-                    if (groupIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(groupId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        groupIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 2:
-                    if (sceneIdExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(sceneId);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneIdExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 3:
-                    if (transitionTimeExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    TLVUnpackError = dataTlv.Get(transitionTime);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        transitionTimeExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 4:
-                    if (sceneNameExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
-                    TLVUnpackError = dataTlv.GetDataPtr(sceneName);
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        sceneNameExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                case 5:
-                    if (extensionFieldSetsExists)
-                    {
-                        ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
-                        TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
-                        break;
-                    }
-                    // Just for compatibility, we will add array type support in IM later.
-                    TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
-                    if (CHIP_NO_ERROR == TLVUnpackError)
-                    {
-                        extensionFieldSetsExists = true;
-                        validArgumentCount++;
-                    }
-                    break;
-                default:
-                    // Unsupported tag, ignore it.
-                    ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
-                    break;
-                }
-                if (TLVUnpackError != CHIP_NO_ERROR)
-                {
-                    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32,
-                                    TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
-                    break;
-                }
-            }
-
-            if (CHIP_END_OF_TLV == TLVError)
-            {
-                // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
-                TLVError = CHIP_NO_ERROR;
-            }
-            else
-            {
-                ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
-            }
-
-            // TODO(#5590) We should encode a response of status code for invalid TLV.
-            if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
-            {
-                // TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
-                emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime,
-                                                              const_cast<uint8_t *>(sceneName), extensionFieldSets);
-            }
-            else if (6 != validArgumentCount)
-            {
-                ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6,
-                                validArgumentCount);
-            }
+        // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV
+// When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error.
+// Any error value TLVUnpackError means we have received an illegal value.
+CHIP_ERROR TLVError = CHIP_NO_ERROR;
+CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR;
+uint8_t status;
+bool statusExists = false;
+uint16_t groupId;
+bool groupIdExists = false;
+uint8_t sceneId;
+bool sceneIdExists = false;
+uint16_t transitionTime;
+bool transitionTimeExists = false;
+const uint8_t * sceneName;
+bool sceneNameExists = false;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+bool extensionFieldSetsExists = false;
+uint32_t validArgumentCount = 0;
+
+while ((TLVError = dataTlv.Next()) == CHIP_NO_ERROR)
+{
+  switch (TLV::TagNumFromTag(dataTlv.GetTag()))
+  {
+    case 0:
+      if (statusExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(status);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            statusExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 1:
+      if (groupIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(groupId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            groupIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 2:
+      if (sceneIdExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(sceneId);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneIdExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 3:
+      if (transitionTimeExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      TLVUnpackError = dataTlv.Get(transitionTime);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            transitionTimeExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 4:
+      if (sceneNameExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // TODO(#5542): The cluster handlers should accept a ByteSpan for all string types.
+      TLVUnpackError = dataTlv.GetDataPtr(sceneName);
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            sceneNameExists = true;
+            validArgumentCount++;
+      }
+      break;
+    case 5:
+      if (extensionFieldSetsExists)
+      {
+            ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(dataTlv.GetTag()));
+            TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT;
+            break;
+      }
+      // Just for compatibility, we will add array type support in IM later.
+      TLVUnpackError = dataTlv.GetDataPtr(const_cast<const uint8_t *&>(extensionFieldSets));
+      if (CHIP_NO_ERROR == TLVUnpackError)
+      {
+            extensionFieldSetsExists = true;
+            validArgumentCount++;
+      }
+      break;
+    default:
+      // Unsupported tag, ignore it.
+      ChipLogProgress(Zcl, "Unknown TLV tag during processing.");
+      break;
+  }
+  if (TLVUnpackError != CHIP_NO_ERROR)
+  {
+    ChipLogProgress(Zcl, "Failed to decode TLV data with tag %" PRIx32 ": %" PRId32, TLV::TagNumFromTag(dataTlv.GetTag()), TLVUnpackError);
+    break;
+  }
+}
+
+if (CHIP_END_OF_TLV == TLVError)
+{
+      // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error.
+      TLVError = CHIP_NO_ERROR;
+}
+else
+{
+      ChipLogProgress(Zcl, "Failed to decode TLV data: %" PRId32, TLVError);
+}
+
+        // TODO(#5590) We should encode a response of status code for invalid TLV.
+if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
+{
+// TODO(#5098) We should pass the Command Object and EndpointId to the cluster callbacks.
+        emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, const_cast<uint8_t*>(sceneName), extensionFieldSets);
+        }
+else if (6 != validArgumentCount)
+{
+      ChipLogProgress(Zcl, "Missing command arguments in TLV data, command requires %d, given %" PRIu32, 6, validArgumentCount);
+}
             break;
         }
         default: {
@@ -3364,15 +3285,16 @@ void DispatchClientCommand(app::Command * command, CommandId commandId, Endpoint
     }
 }
 
-} // namespace Scenes
+}
+
 
 } // namespace clusters
 
 void DispatchSingleClusterCommand(chip::ClusterId aClusterId, chip::CommandId aCommandId, chip::EndpointId aEndPointId,
-                                  chip::TLV::TLVReader & aReader, Command * apCommandObj)
+                             chip::TLV::TLVReader & aReader, Command * apCommandObj)
 {
-    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId, aCommandId,
-                  aEndPointId);
+    ChipLogDetail(Zcl, "Received Cluster Command: Cluster=%" PRIx16 " Command=%" PRIx8 " Endpoint=%" PRIx8, aClusterId,
+                  aCommandId, aEndPointId);
     Compatibility::SetupEmberAfObjects(apCommandObj, aClusterId, aCommandId, aEndPointId);
     switch (aClusterId)
     {
diff --git a/src/darwin/Framework/CHIP/gen/af-structs.h b/src/darwin/Framework/CHIP/gen/af-structs.h
index 798bcd903e1e8e..f1edb05621fa5d 100644
--- a/src/darwin/Framework/CHIP/gen/af-structs.h
+++ b/src/darwin/Framework/CHIP/gen/af-structs.h
@@ -20,141 +20,126 @@
 // Prevent multiple inclusion
 #pragma once
 
+#include <stdint.h>
 #include "basic-types.h"
 #include "enums.h"
-#include <stdint.h>
+
 
 // Struct for ApplicationLauncherApp
-typedef struct _ApplicationLauncherApp
-{
-    uint16_t catalogVendorId;
-    uint8_t * applicationId;
+typedef struct _ApplicationLauncherApp {
+  uint16_t catalogVendorId;
+  uint8_t * applicationId;
 } EmberAfApplicationLauncherApp;
 
 // Struct for AudioOutputInfo
-typedef struct _AudioOutputInfo
-{
-    uint8_t Index;
-    uint8_t OutputType;
-    uint8_t * Name;
+typedef struct _AudioOutputInfo {
+  uint8_t Index;
+  uint8_t OutputType;
+  uint8_t * Name;
 } EmberAfAudioOutputInfo;
 
 // Struct for BasicCommissioningInfo
-typedef struct _BasicCommissioningInfo
-{
-    uint32_t FailSafeExpiryLengthMs;
+typedef struct _BasicCommissioningInfo {
+  uint32_t FailSafeExpiryLengthMs;
 } EmberAfBasicCommissioningInfo;
 
 // Struct for BlockThreshold
-typedef struct _BlockThreshold
-{
-    uint8_t blockThreshold;
-    uint8_t priceControl;
-    uint32_t blockPeriodStartTime;
-    uint32_t blockPeriodDurationMinutes;
-    uint8_t fuelType;
-    uint32_t standingCharge;
+typedef struct _BlockThreshold {
+  uint8_t blockThreshold;
+  uint8_t priceControl;
+  uint32_t blockPeriodStartTime;
+  uint32_t blockPeriodDurationMinutes;
+  uint8_t fuelType;
+  uint32_t standingCharge;
 } EmberAfBlockThreshold;
 
 // Struct for BlockThresholdSubPayload
-typedef struct _BlockThresholdSubPayload
-{
-    uint8_t tierNumberOfBlockThresholds;
-    uint8_t * blockThreshold;
+typedef struct _BlockThresholdSubPayload {
+  uint8_t tierNumberOfBlockThresholds;
+  uint8_t * blockThreshold;
 } EmberAfBlockThresholdSubPayload;
 
 // Struct for ChatParticipant
-typedef struct _ChatParticipant
-{
-    uint16_t uid;
-    uint8_t * nickname;
+typedef struct _ChatParticipant {
+  uint16_t uid;
+  uint8_t * nickname;
 } EmberAfChatParticipant;
 
 // Struct for ChatRoom
-typedef struct _ChatRoom
-{
-    uint16_t cid;
-    uint8_t * name;
+typedef struct _ChatRoom {
+  uint16_t cid;
+  uint8_t * name;
 } EmberAfChatRoom;
 
 // Struct for ConfigureReportingRecord
-typedef struct _ConfigureReportingRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ConfigureReportingRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfConfigureReportingRecord;
 
 // Struct for ConfigureReportingStatusRecord
-typedef struct _ConfigureReportingStatusRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ConfigureReportingStatusRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfConfigureReportingStatusRecord;
 
 // Struct for ContentLaunchAdditionalInfo
-typedef struct _ContentLaunchAdditionalInfo
-{
-    uint8_t * Name;
-    uint8_t * Value;
+typedef struct _ContentLaunchAdditionalInfo {
+  uint8_t * Name;
+  uint8_t * Value;
 } EmberAfContentLaunchAdditionalInfo;
 
 // Struct for ContentLaunchSearch
-typedef struct _ContentLaunchSearch
-{
-    uint8_t EntitiesList;
-    uint8_t * searchWindowStart;
-    uint8_t * searchWindowEnd;
+typedef struct _ContentLaunchSearch {
+  uint8_t EntitiesList;
+  uint8_t * searchWindowStart;
+  uint8_t * searchWindowEnd;
 } EmberAfContentLaunchSearch;
 
 // Struct for DebtPayload
-typedef struct _DebtPayload
-{
-    uint32_t collectionTime;
-    uint32_t amountCollected;
-    uint8_t debtType;
-    uint32_t outstandingDebt;
+typedef struct _DebtPayload {
+  uint32_t collectionTime;
+  uint32_t amountCollected;
+  uint8_t debtType;
+  uint32_t outstandingDebt;
 } EmberAfDebtPayload;
 
 // Struct for DeviceInformationRecord
-typedef struct _DeviceInformationRecord
-{
-    uint64_t ieeeAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
-    uint8_t groupIdCount;
-    uint8_t sort;
+typedef struct _DeviceInformationRecord {
+  uint64_t ieeeAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
+  uint8_t groupIdCount;
+  uint8_t sort;
 } EmberAfDeviceInformationRecord;
 
 // Struct for DeviceType
-typedef struct _DeviceType
-{
-    chip::DeviceTypeId type;
-    uint16_t revision;
+typedef struct _DeviceType {
+  chip::DeviceTypeId type;
+  uint16_t revision;
 } EmberAfDeviceType;
 
 // Struct for DiscoverAttributesInfoRecord
-typedef struct _DiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
+typedef struct _DiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
 } EmberAfDiscoverAttributesInfoRecord;
 
 // Struct for EndpointInformationRecord
-typedef struct _EndpointInformationRecord
-{
-    uint16_t networkAddress;
-    chip::EndpointId endpointId;
-    uint16_t profileId;
-    uint16_t deviceId;
-    uint8_t version;
+typedef struct _EndpointInformationRecord {
+  uint16_t networkAddress;
+  chip::EndpointId endpointId;
+  uint16_t profileId;
+  uint16_t deviceId;
+  uint8_t version;
 } EmberAfEndpointInformationRecord;
 
 // Void typedef for EmberAfEphemeralData which is empty.
@@ -162,79 +147,70 @@ typedef struct _EndpointInformationRecord
 typedef uint8_t EmberAfEphemeralData;
 
 // Struct for EventConfigurationPayload
-typedef struct _EventConfigurationPayload
-{
-    uint16_t eventId;
-    uint8_t eventConfiguration;
+typedef struct _EventConfigurationPayload {
+  uint16_t eventId;
+  uint8_t eventConfiguration;
 } EmberAfEventConfigurationPayload;
 
 // Struct for EventLogPayload
-typedef struct _EventLogPayload
-{
-    uint8_t logId;
-    uint16_t eventId;
-    uint32_t eventTime;
-    uint8_t * eventData;
+typedef struct _EventLogPayload {
+  uint8_t logId;
+  uint16_t eventId;
+  uint32_t eventTime;
+  uint8_t * eventData;
 } EmberAfEventLogPayload;
 
 // Struct for ExtendedDiscoverAttributesInfoRecord
-typedef struct _ExtendedDiscoverAttributesInfoRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t attributeAccessControl;
+typedef struct _ExtendedDiscoverAttributesInfoRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t attributeAccessControl;
 } EmberAfExtendedDiscoverAttributesInfoRecord;
 
 // Struct for GpPairingConfigurationGroupList
-typedef struct _GpPairingConfigurationGroupList
-{
-    uint16_t SinkGroup;
-    uint16_t Alias;
+typedef struct _GpPairingConfigurationGroupList {
+  uint16_t SinkGroup;
+  uint16_t Alias;
 } EmberAfGpPairingConfigurationGroupList;
 
 // Struct for GpTranslationTableUpdateTranslation
-typedef struct _GpTranslationTableUpdateTranslation
-{
-    uint8_t index;
-    uint8_t gpdCommandId;
-    chip::EndpointId endpoint;
-    uint16_t profile;
-    uint16_t cluster;
-    uint8_t zigbeeCommandId;
-    uint8_t * zigbeeCommandPayload;
-    uint8_t * additionalInfoBlock;
+typedef struct _GpTranslationTableUpdateTranslation {
+  uint8_t index;
+  uint8_t gpdCommandId;
+  chip::EndpointId endpoint;
+  uint16_t profile;
+  uint16_t cluster;
+  uint8_t zigbeeCommandId;
+  uint8_t * zigbeeCommandPayload;
+  uint8_t * additionalInfoBlock;
 } EmberAfGpTranslationTableUpdateTranslation;
 
 // Struct for GroupInformationRecord
-typedef struct _GroupInformationRecord
-{
-    chip::GroupId groupId;
-    uint8_t groupType;
+typedef struct _GroupInformationRecord {
+  chip::GroupId groupId;
+  uint8_t groupType;
 } EmberAfGroupInformationRecord;
 
 // Struct for GroupKeys
-typedef struct _GroupKeys
-{
-    uint16_t VendorId;
-    uint16_t GroupKeyIndex;
-    /* TYPE WARNING: array array defaults to */ uint8_t * GroupKeyRoot;
-    uint64_t GroupKeyEpochStartTime;
-    uint8_t GroupKeySecurityPolicy;
+typedef struct _GroupKeys {
+  uint16_t VendorId;
+  uint16_t GroupKeyIndex;
+  /* TYPE WARNING: array array defaults to */ uint8_t *  GroupKeyRoot;
+  uint64_t GroupKeyEpochStartTime;
+  uint8_t GroupKeySecurityPolicy;
 } EmberAfGroupKeys;
 
 // Struct for GroupState
-typedef struct _GroupState
-{
-    uint16_t VendorId;
-    uint16_t VendorGroupId;
-    uint16_t GroupKeySetIndex;
+typedef struct _GroupState {
+  uint16_t VendorId;
+  uint16_t VendorGroupId;
+  uint16_t GroupKeySetIndex;
 } EmberAfGroupState;
 
 // Struct for IasAceZoneStatusResult
-typedef struct _IasAceZoneStatusResult
-{
-    uint8_t zoneId;
-    uint16_t zoneStatus;
+typedef struct _IasAceZoneStatusResult {
+  uint8_t zoneId;
+  uint16_t zoneStatus;
 } EmberAfIasAceZoneStatusResult;
 
 // Void typedef for EmberAfIdentity which is empty.
@@ -242,171 +218,150 @@ typedef struct _IasAceZoneStatusResult
 typedef uint8_t EmberAfIdentity;
 
 // Struct for MediaInputInfo
-typedef struct _MediaInputInfo
-{
-    uint8_t Index;
-    uint8_t InputType;
-    uint8_t * Name;
-    uint8_t * Description;
+typedef struct _MediaInputInfo {
+  uint8_t Index;
+  uint8_t InputType;
+  uint8_t * Name;
+  uint8_t * Description;
 } EmberAfMediaInputInfo;
 
 // Struct for NavigateTargetTargetInfo
-typedef struct _NavigateTargetTargetInfo
-{
-    uint8_t identifier;
-    uint8_t * name;
+typedef struct _NavigateTargetTargetInfo {
+  uint8_t identifier;
+  uint8_t * name;
 } EmberAfNavigateTargetTargetInfo;
 
 // Struct for NeighborInfo
-typedef struct _NeighborInfo
-{
-    uint64_t neighbor;
-    int16_t x;
-    int16_t y;
-    int16_t z;
-    int8_t rssi;
-    uint8_t numberRssiMeasurements;
+typedef struct _NeighborInfo {
+  uint64_t neighbor;
+  int16_t x;
+  int16_t y;
+  int16_t z;
+  int8_t rssi;
+  uint8_t numberRssiMeasurements;
 } EmberAfNeighborInfo;
 
 // Struct for NodeInformation
-typedef struct _NodeInformation
-{
-    uint16_t uid;
-    uint16_t address;
-    chip::EndpointId endpoint;
-    uint8_t * nickname;
+typedef struct _NodeInformation {
+  uint16_t uid;
+  uint16_t address;
+  chip::EndpointId endpoint;
+  uint8_t * nickname;
 } EmberAfNodeInformation;
 
 // Struct for Notification
-typedef struct _Notification
-{
-    uint16_t contentId;
-    uint8_t statusFeedback;
+typedef struct _Notification {
+  uint16_t contentId;
+  uint8_t statusFeedback;
 } EmberAfNotification;
 
 // Struct for PowerProfileRecord
-typedef struct _PowerProfileRecord
-{
-    uint8_t powerProfileId;
-    uint8_t energyPhaseId;
-    uint8_t powerProfileRemoteControl;
-    uint8_t powerProfileState;
+typedef struct _PowerProfileRecord {
+  uint8_t powerProfileId;
+  uint8_t energyPhaseId;
+  uint8_t powerProfileRemoteControl;
+  uint8_t powerProfileState;
 } EmberAfPowerProfileRecord;
 
 // Struct for PriceMatrixSubPayload
-typedef struct _PriceMatrixSubPayload
-{
-    uint8_t tierBlockId;
-    uint32_t price;
+typedef struct _PriceMatrixSubPayload {
+  uint8_t tierBlockId;
+  uint32_t price;
 } EmberAfPriceMatrixSubPayload;
 
 // Struct for Protocol
-typedef struct _Protocol
-{
-    uint16_t manufacturerCode;
-    uint8_t protocolId;
+typedef struct _Protocol {
+  uint16_t manufacturerCode;
+  uint8_t protocolId;
 } EmberAfProtocol;
 
 // Struct for ReadAttributeStatusRecord
-typedef struct _ReadAttributeStatusRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t status;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReadAttributeStatusRecord {
+  chip::AttributeId attributeId;
+  uint8_t status;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReadAttributeStatusRecord;
 
 // Struct for ReadReportingConfigurationAttributeRecord
-typedef struct _ReadReportingConfigurationAttributeRecord
-{
-    uint8_t direction;
-    chip::AttributeId attributeId;
+typedef struct _ReadReportingConfigurationAttributeRecord {
+  uint8_t direction;
+  chip::AttributeId attributeId;
 } EmberAfReadReportingConfigurationAttributeRecord;
 
 // Struct for ReadReportingConfigurationRecord
-typedef struct _ReadReportingConfigurationRecord
-{
-    uint8_t status;
-    uint8_t direction;
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint16_t minimumReportingInterval;
-    uint16_t maximumReportingInterval;
-    uint8_t * reportableChangeLocation;
-    uint16_t timeoutPeriod;
+typedef struct _ReadReportingConfigurationRecord {
+  uint8_t status;
+  uint8_t direction;
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint16_t minimumReportingInterval;
+  uint16_t maximumReportingInterval;
+  uint8_t * reportableChangeLocation;
+  uint16_t timeoutPeriod;
 } EmberAfReadReportingConfigurationRecord;
 
 // Struct for ReadStructuredAttributeRecord
-typedef struct _ReadStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _ReadStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfReadStructuredAttributeRecord;
 
 // Struct for ReportAttributeRecord
-typedef struct _ReportAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _ReportAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfReportAttributeRecord;
 
 // Struct for SceneExtensionAttributeInfo
-typedef struct _SceneExtensionAttributeInfo
-{
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _SceneExtensionAttributeInfo {
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfSceneExtensionAttributeInfo;
 
 // Struct for SceneExtensionFieldSet
-typedef struct _SceneExtensionFieldSet
-{
-    chip::ClusterId clusterId;
-    uint8_t length;
-    uint8_t value;
+typedef struct _SceneExtensionFieldSet {
+  chip::ClusterId clusterId;
+  uint8_t length;
+  uint8_t value;
 } EmberAfSceneExtensionFieldSet;
 
 // Struct for ScheduleEntry
-typedef struct _ScheduleEntry
-{
-    uint16_t startTime;
-    uint8_t activePriceTierOrFriendlyCreditEnable;
+typedef struct _ScheduleEntry {
+  uint16_t startTime;
+  uint8_t activePriceTierOrFriendlyCreditEnable;
 } EmberAfScheduleEntry;
 
 // Struct for ScheduleEntryAuxilliaryLoadSwitchTimes
-typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t auxiliaryLoadSwitchState;
+typedef struct _ScheduleEntryAuxilliaryLoadSwitchTimes {
+  uint16_t startTime;
+  uint8_t auxiliaryLoadSwitchState;
 } EmberAfScheduleEntryAuxilliaryLoadSwitchTimes;
 
 // Struct for ScheduleEntryFriendlyCreditSwitchTimes
-typedef struct _ScheduleEntryFriendlyCreditSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t friendlyCreditEnable;
+typedef struct _ScheduleEntryFriendlyCreditSwitchTimes {
+  uint16_t startTime;
+  uint8_t friendlyCreditEnable;
 } EmberAfScheduleEntryFriendlyCreditSwitchTimes;
 
 // Struct for ScheduleEntryRateSwitchTimes
-typedef struct _ScheduleEntryRateSwitchTimes
-{
-    uint16_t startTime;
-    uint8_t priceTier;
+typedef struct _ScheduleEntryRateSwitchTimes {
+  uint16_t startTime;
+  uint8_t priceTier;
 } EmberAfScheduleEntryRateSwitchTimes;
 
 // Struct for ScheduledPhase
-typedef struct _ScheduledPhase
-{
-    uint8_t energyPhaseId;
-    uint16_t scheduledTime;
+typedef struct _ScheduledPhase {
+  uint8_t energyPhaseId;
+  uint16_t scheduledTime;
 } EmberAfScheduledPhase;
 
 // Struct for SeasonEntry
-typedef struct _SeasonEntry
-{
-    uint32_t seasonStartDate;
-    uint8_t weekIdRef;
+typedef struct _SeasonEntry {
+  uint32_t seasonStartDate;
+  uint8_t weekIdRef;
 } EmberAfSeasonEntry;
 
 // Void typedef for EmberAfSignature which is empty.
@@ -418,135 +373,119 @@ typedef uint8_t EmberAfSignature;
 typedef uint8_t EmberAfSmac;
 
 // Struct for SnapshotResponsePayload
-typedef struct _SnapshotResponsePayload
-{
-    uint8_t snapshotScheduleId;
-    uint8_t snapshotScheduleConfirmation;
+typedef struct _SnapshotResponsePayload {
+  uint8_t snapshotScheduleId;
+  uint8_t snapshotScheduleConfirmation;
 } EmberAfSnapshotResponsePayload;
 
 // Struct for SnapshotSchedulePayload
-typedef struct _SnapshotSchedulePayload
-{
-    uint8_t snapshotScheduleId;
-    uint32_t snapshotStartTime;
-    uint32_t snapshotSchedule;
-    uint8_t snapshotPayloadType;
-    uint32_t snapshotCause;
+typedef struct _SnapshotSchedulePayload {
+  uint8_t snapshotScheduleId;
+  uint32_t snapshotStartTime;
+  uint32_t snapshotSchedule;
+  uint8_t snapshotPayloadType;
+  uint32_t snapshotCause;
 } EmberAfSnapshotSchedulePayload;
 
 // Struct for SpecialDay
-typedef struct _SpecialDay
-{
-    uint32_t specialDayDate;
-    uint8_t dayIdRef;
+typedef struct _SpecialDay {
+  uint32_t specialDayDate;
+  uint8_t dayIdRef;
 } EmberAfSpecialDay;
 
 // Struct for ThreadInterfaceScanResult
-typedef struct _ThreadInterfaceScanResult
-{
-    uint8_t * DiscoveryResponse;
+typedef struct _ThreadInterfaceScanResult {
+  uint8_t * DiscoveryResponse;
 } EmberAfThreadInterfaceScanResult;
 
 // Struct for TierLabelsPayload
-typedef struct _TierLabelsPayload
-{
-    uint8_t tierId;
-    uint8_t * tierLabel;
+typedef struct _TierLabelsPayload {
+  uint8_t tierId;
+  uint8_t * tierLabel;
 } EmberAfTierLabelsPayload;
 
 // Struct for TopUpPayload
-typedef struct _TopUpPayload
-{
-    uint8_t * topUpCode;
-    int32_t topUpAmount;
-    uint32_t topUpTime;
+typedef struct _TopUpPayload {
+  uint8_t * topUpCode;
+  int32_t topUpAmount;
+  uint32_t topUpTime;
 } EmberAfTopUpPayload;
 
 // Struct for TransferredPhase
-typedef struct _TransferredPhase
-{
-    uint8_t energyPhaseId;
-    uint8_t macroPhaseId;
-    uint16_t expectedDuration;
-    uint16_t peakPower;
-    uint16_t energy;
-    uint16_t maxActivationDelay;
+typedef struct _TransferredPhase {
+  uint8_t energyPhaseId;
+  uint8_t macroPhaseId;
+  uint16_t expectedDuration;
+  uint16_t peakPower;
+  uint16_t energy;
+  uint16_t maxActivationDelay;
 } EmberAfTransferredPhase;
 
 // Struct for TvChannelInfo
-typedef struct _TvChannelInfo
-{
-    uint16_t MajorNumber;
-    uint16_t MinorNumber;
-    uint8_t * Name;
-    uint8_t * CallSign;
-    uint8_t * AffiliateCallSign;
+typedef struct _TvChannelInfo {
+  uint16_t MajorNumber;
+  uint16_t MinorNumber;
+  uint8_t * Name;
+  uint8_t * CallSign;
+  uint8_t * AffiliateCallSign;
 } EmberAfTvChannelInfo;
 
 // Struct for TvChannelLineupInfo
-typedef struct _TvChannelLineupInfo
-{
-    uint8_t * OperatorName;
-    uint8_t * LineupName;
-    uint8_t * PostalCode;
-    uint8_t LineupInfoType;
+typedef struct _TvChannelLineupInfo {
+  uint8_t * OperatorName;
+  uint8_t * LineupName;
+  uint8_t * PostalCode;
+  uint8_t LineupInfoType;
 } EmberAfTvChannelLineupInfo;
 
 // Struct for WiFiInterfaceScanResult
-typedef struct _WiFiInterfaceScanResult
-{
-    uint8_t Security;
-    uint8_t * SSID;
-    uint8_t * BSSID;
-    uint8_t Channel;
-    uint32_t FrequencyBand;
+typedef struct _WiFiInterfaceScanResult {
+  uint8_t Security;
+  uint8_t * SSID;
+  uint8_t * BSSID;
+  uint8_t Channel;
+  uint32_t FrequencyBand;
 } EmberAfWiFiInterfaceScanResult;
 
 // Struct for WriteAttributeRecord
-typedef struct _WriteAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteAttributeRecord;
 
 // Struct for WriteAttributeStatusRecord
-typedef struct _WriteAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
+typedef struct _WriteAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
 } EmberAfWriteAttributeStatusRecord;
 
 // Struct for WriteStructuredAttributeRecord
-typedef struct _WriteStructuredAttributeRecord
-{
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
-    uint8_t attributeType;
-    uint8_t * attributeLocation;
+typedef struct _WriteStructuredAttributeRecord {
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
+  uint8_t attributeType;
+  uint8_t * attributeLocation;
 } EmberAfWriteStructuredAttributeRecord;
 
 // Struct for WriteStructuredAttributeStatusRecord
-typedef struct _WriteStructuredAttributeStatusRecord
-{
-    uint8_t status;
-    chip::AttributeId attributeId;
-    uint8_t indicator;
-    uint16_t indicies;
+typedef struct _WriteStructuredAttributeStatusRecord {
+  uint8_t status;
+  chip::AttributeId attributeId;
+  uint8_t indicator;
+  uint16_t indicies;
 } EmberAfWriteStructuredAttributeStatusRecord;
 
 // Struct for WwahBeaconSurvey
-typedef struct _WwahBeaconSurvey
-{
-    uint16_t deviceShort;
-    uint8_t rssi;
-    uint8_t classificationMask;
+typedef struct _WwahBeaconSurvey {
+  uint16_t deviceShort;
+  uint8_t rssi;
+  uint8_t classificationMask;
 } EmberAfWwahBeaconSurvey;
 
 // Struct for WwahClusterStatusToUseTC
-typedef struct _WwahClusterStatusToUseTC
-{
-    chip::ClusterId clusterId;
-    uint8_t status;
+typedef struct _WwahClusterStatusToUseTC {
+  chip::ClusterId clusterId;
+  uint8_t status;
 } EmberAfWwahClusterStatusToUseTC;
diff --git a/src/darwin/Framework/CHIP/gen/attribute-id.h b/src/darwin/Framework/CHIP/gen/attribute-id.h
index 2b45ff436b89eb..b7af982a21a0f8 100644
--- a/src/darwin/Framework/CHIP/gen/attribute-id.h
+++ b/src/darwin/Framework/CHIP/gen/attribute-id.h
@@ -4242,3 +4242,4 @@
 #define ZCL_SL_PENDING_NETWORK_UPDATE_CHANNEL_ATTRIBUTE_ID (0x0011)
 #define ZCL_SL_PENDING_NETWORK_UPDATE_PANID_ATTRIBUTE_ID (0x0012)
 #define ZCL_SL_OTA_MAX_OFFLINE_DURATION_ATTRIBUTE_ID (0x0013)
+
diff --git a/src/darwin/Framework/CHIP/gen/attribute-size.h b/src/darwin/Framework/CHIP/gen/attribute-size.h
index ee211cea0c9aea..04f58678fd502d 100644
--- a/src/darwin/Framework/CHIP/gen/attribute-size.h
+++ b/src/darwin/Framework/CHIP/gen/attribute-size.h
@@ -21,17 +21,54 @@
 #pragma once
 
 // ZCL attribute sizes
-ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_TYPE, 3, ZCL_DATA32_ATTRIBUTE_TYPE, 4,
-    ZCL_DATA40_ATTRIBUTE_TYPE, 5, ZCL_DATA48_ATTRIBUTE_TYPE, 6, ZCL_DATA56_ATTRIBUTE_TYPE, 7, ZCL_DATA64_ATTRIBUTE_TYPE, 8,
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
-    ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP40_ATTRIBUTE_TYPE, 5, ZCL_BITMAP48_ATTRIBUTE_TYPE, 6, ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
-    ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_INT24U_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, ZCL_INT56U_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, ZCL_INT24S_ATTRIBUTE_TYPE, 3,
-    ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, ZCL_INT56S_ATTRIBUTE_TYPE, 7,
-    ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8, ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
-    ZCL_DATE_ATTRIBUTE_TYPE, 4, ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2, ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE,
-    2, ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4, ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8, ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1, ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1, ZCL_NODE_ID_ATTRIBUTE_TYPE,
-    8, ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA8_ATTRIBUTE_TYPE, 1,
+  ZCL_DATA16_ATTRIBUTE_TYPE, 2,
+  ZCL_DATA24_ATTRIBUTE_TYPE, 3,
+  ZCL_DATA32_ATTRIBUTE_TYPE, 4,
+  ZCL_DATA40_ATTRIBUTE_TYPE, 5,
+  ZCL_DATA48_ATTRIBUTE_TYPE, 6,
+  ZCL_DATA56_ATTRIBUTE_TYPE, 7,
+  ZCL_DATA64_ATTRIBUTE_TYPE, 8,
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP8_ATTRIBUTE_TYPE, 1,
+  ZCL_BITMAP16_ATTRIBUTE_TYPE, 2,
+  ZCL_BITMAP24_ATTRIBUTE_TYPE, 3,
+  ZCL_BITMAP32_ATTRIBUTE_TYPE, 4,
+  ZCL_BITMAP40_ATTRIBUTE_TYPE, 5,
+  ZCL_BITMAP48_ATTRIBUTE_TYPE, 6,
+  ZCL_BITMAP56_ATTRIBUTE_TYPE, 7,
+  ZCL_BITMAP64_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8U_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16U_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24U_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32U_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40U_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48U_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56U_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64U_ATTRIBUTE_TYPE, 8,
+  ZCL_INT8S_ATTRIBUTE_TYPE, 1,
+  ZCL_INT16S_ATTRIBUTE_TYPE, 2,
+  ZCL_INT24S_ATTRIBUTE_TYPE, 3,
+  ZCL_INT32S_ATTRIBUTE_TYPE, 4,
+  ZCL_INT40S_ATTRIBUTE_TYPE, 5,
+  ZCL_INT48S_ATTRIBUTE_TYPE, 6,
+  ZCL_INT56S_ATTRIBUTE_TYPE, 7,
+  ZCL_INT64S_ATTRIBUTE_TYPE, 8,
+  ZCL_ENUM8_ATTRIBUTE_TYPE, 1,
+  ZCL_ENUM16_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE, 2,
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE, 4,
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE, 8,
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE, 4,
+  ZCL_DATE_ATTRIBUTE_TYPE, 4,
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE, 4,
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE, 4,
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE, 8,
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE, 16,
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2,
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 1,
+  ZCL_NODE_ID_ATTRIBUTE_TYPE, 8,
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE, 4,
diff --git a/src/darwin/Framework/CHIP/gen/attribute-type.h b/src/darwin/Framework/CHIP/gen/attribute-type.h
index 6f129997a76305..8df464386fb45e 100644
--- a/src/darwin/Framework/CHIP/gen/attribute-type.h
+++ b/src/darwin/Framework/CHIP/gen/attribute-type.h
@@ -21,67 +21,66 @@
 #pragma once
 
 // ZCL attribute types
-enum
-{
-    ZCL_NO_DATA_ATTRIBUTE_TYPE           = 0x00, // No data
-    ZCL_DATA8_ATTRIBUTE_TYPE             = 0x08, // 8-bit data
-    ZCL_DATA16_ATTRIBUTE_TYPE            = 0x09, // 16-bit data
-    ZCL_DATA24_ATTRIBUTE_TYPE            = 0x0A, // 24-bit data
-    ZCL_DATA32_ATTRIBUTE_TYPE            = 0x0B, // 32-bit data
-    ZCL_DATA40_ATTRIBUTE_TYPE            = 0x0C, // 40-bit data
-    ZCL_DATA48_ATTRIBUTE_TYPE            = 0x0D, // 48-bit data
-    ZCL_DATA56_ATTRIBUTE_TYPE            = 0x0E, // 56-bit data
-    ZCL_DATA64_ATTRIBUTE_TYPE            = 0x0F, // 64-bit data
-    ZCL_BOOLEAN_ATTRIBUTE_TYPE           = 0x10, // Boolean
-    ZCL_BITMAP8_ATTRIBUTE_TYPE           = 0x18, // 8-bit bitmap
-    ZCL_BITMAP16_ATTRIBUTE_TYPE          = 0x19, // 16-bit bitmap
-    ZCL_BITMAP24_ATTRIBUTE_TYPE          = 0x1A, // 24-bit bitmap
-    ZCL_BITMAP32_ATTRIBUTE_TYPE          = 0x1B, // 32-bit bitmap
-    ZCL_BITMAP40_ATTRIBUTE_TYPE          = 0x1C, // 40-bit bitmap
-    ZCL_BITMAP48_ATTRIBUTE_TYPE          = 0x1D, // 48-bit bitmap
-    ZCL_BITMAP56_ATTRIBUTE_TYPE          = 0x1E, // 56-bit bitmap
-    ZCL_BITMAP64_ATTRIBUTE_TYPE          = 0x1F, // 64-bit bitmap
-    ZCL_INT8U_ATTRIBUTE_TYPE             = 0x20, // Unsigned 8-bit integer
-    ZCL_INT16U_ATTRIBUTE_TYPE            = 0x21, // Unsigned 16-bit integer
-    ZCL_INT24U_ATTRIBUTE_TYPE            = 0x22, // Unsigned 24-bit integer
-    ZCL_INT32U_ATTRIBUTE_TYPE            = 0x23, // Unsigned 32-bit integer
-    ZCL_INT40U_ATTRIBUTE_TYPE            = 0x24, // Unsigned 40-bit integer
-    ZCL_INT48U_ATTRIBUTE_TYPE            = 0x25, // Unsigned 48-bit integer
-    ZCL_INT56U_ATTRIBUTE_TYPE            = 0x26, // Unsigned 56-bit integer
-    ZCL_INT64U_ATTRIBUTE_TYPE            = 0x27, // Unsigned 64-bit integer
-    ZCL_INT8S_ATTRIBUTE_TYPE             = 0x28, // Signed 8-bit integer
-    ZCL_INT16S_ATTRIBUTE_TYPE            = 0x29, // Signed 16-bit integer
-    ZCL_INT24S_ATTRIBUTE_TYPE            = 0x2A, // Signed 24-bit integer
-    ZCL_INT32S_ATTRIBUTE_TYPE            = 0x2B, // Signed 32-bit integer
-    ZCL_INT40S_ATTRIBUTE_TYPE            = 0x2C, // Signed 40-bit integer
-    ZCL_INT48S_ATTRIBUTE_TYPE            = 0x2D, // Signed 48-bit integer
-    ZCL_INT56S_ATTRIBUTE_TYPE            = 0x2E, // Signed 56-bit integer
-    ZCL_INT64S_ATTRIBUTE_TYPE            = 0x2F, // Signed 64-bit integer
-    ZCL_ENUM8_ATTRIBUTE_TYPE             = 0x30, // 8-bit enumeration
-    ZCL_ENUM16_ATTRIBUTE_TYPE            = 0x31, // 16-bit enumeration
-    ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE        = 0x38, // Semi-precision
-    ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE      = 0x39, // Single precision
-    ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE      = 0x3A, // Double precision
-    ZCL_OCTET_STRING_ATTRIBUTE_TYPE      = 0x41, // Octet string
-    ZCL_CHAR_STRING_ATTRIBUTE_TYPE       = 0x42, // Character string
-    ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
-    ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE  = 0x44, // Long character string
-    ZCL_ARRAY_ATTRIBUTE_TYPE             = 0x48, // Array
-    ZCL_STRUCT_ATTRIBUTE_TYPE            = 0x4C, // Structure
-    ZCL_SET_ATTRIBUTE_TYPE               = 0x50, // Set
-    ZCL_BAG_ATTRIBUTE_TYPE               = 0x51, // Bag
-    ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE       = 0xE0, // Time of day
-    ZCL_DATE_ATTRIBUTE_TYPE              = 0xE1, // Date
-    ZCL_UTC_TIME_ATTRIBUTE_TYPE          = 0xE2, // UTC Time
-    ZCL_CLUSTER_ID_ATTRIBUTE_TYPE        = 0xE8, // Cluster ID
-    ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE      = 0xE9, // Attribute ID
-    ZCL_BACNET_OID_ATTRIBUTE_TYPE        = 0xEA, // BACnet OID
-    ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE      = 0xF0, // IEEE address
-    ZCL_SECURITY_KEY_ATTRIBUTE_TYPE      = 0xF1, // 128-bit security key
-    ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE       = 0xF2, // Endpoint Id
-    ZCL_GROUP_ID_ATTRIBUTE_TYPE          = 0xF3, // Group Id
-    ZCL_COMMAND_ID_ATTRIBUTE_TYPE        = 0xF4, // Command Id
-    ZCL_NODE_ID_ATTRIBUTE_TYPE           = 0xF5, // Node Id
-    ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE    = 0xF6, // Device Type Id
-    ZCL_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
+enum {
+  ZCL_NO_DATA_ATTRIBUTE_TYPE = 0x00, // No data
+  ZCL_DATA8_ATTRIBUTE_TYPE = 0x08, // 8-bit data
+  ZCL_DATA16_ATTRIBUTE_TYPE = 0x09, // 16-bit data
+  ZCL_DATA24_ATTRIBUTE_TYPE = 0x0A, // 24-bit data
+  ZCL_DATA32_ATTRIBUTE_TYPE = 0x0B, // 32-bit data
+  ZCL_DATA40_ATTRIBUTE_TYPE = 0x0C, // 40-bit data
+  ZCL_DATA48_ATTRIBUTE_TYPE = 0x0D, // 48-bit data
+  ZCL_DATA56_ATTRIBUTE_TYPE = 0x0E, // 56-bit data
+  ZCL_DATA64_ATTRIBUTE_TYPE = 0x0F, // 64-bit data
+  ZCL_BOOLEAN_ATTRIBUTE_TYPE = 0x10, // Boolean
+  ZCL_BITMAP8_ATTRIBUTE_TYPE = 0x18, // 8-bit bitmap
+  ZCL_BITMAP16_ATTRIBUTE_TYPE = 0x19, // 16-bit bitmap
+  ZCL_BITMAP24_ATTRIBUTE_TYPE = 0x1A, // 24-bit bitmap
+  ZCL_BITMAP32_ATTRIBUTE_TYPE = 0x1B, // 32-bit bitmap
+  ZCL_BITMAP40_ATTRIBUTE_TYPE = 0x1C, // 40-bit bitmap
+  ZCL_BITMAP48_ATTRIBUTE_TYPE = 0x1D, // 48-bit bitmap
+  ZCL_BITMAP56_ATTRIBUTE_TYPE = 0x1E, // 56-bit bitmap
+  ZCL_BITMAP64_ATTRIBUTE_TYPE = 0x1F, // 64-bit bitmap
+  ZCL_INT8U_ATTRIBUTE_TYPE = 0x20, // Unsigned 8-bit integer
+  ZCL_INT16U_ATTRIBUTE_TYPE = 0x21, // Unsigned 16-bit integer
+  ZCL_INT24U_ATTRIBUTE_TYPE = 0x22, // Unsigned 24-bit integer
+  ZCL_INT32U_ATTRIBUTE_TYPE = 0x23, // Unsigned 32-bit integer
+  ZCL_INT40U_ATTRIBUTE_TYPE = 0x24, // Unsigned 40-bit integer
+  ZCL_INT48U_ATTRIBUTE_TYPE = 0x25, // Unsigned 48-bit integer
+  ZCL_INT56U_ATTRIBUTE_TYPE = 0x26, // Unsigned 56-bit integer
+  ZCL_INT64U_ATTRIBUTE_TYPE = 0x27, // Unsigned 64-bit integer
+  ZCL_INT8S_ATTRIBUTE_TYPE = 0x28, // Signed 8-bit integer
+  ZCL_INT16S_ATTRIBUTE_TYPE = 0x29, // Signed 16-bit integer
+  ZCL_INT24S_ATTRIBUTE_TYPE = 0x2A, // Signed 24-bit integer
+  ZCL_INT32S_ATTRIBUTE_TYPE = 0x2B, // Signed 32-bit integer
+  ZCL_INT40S_ATTRIBUTE_TYPE = 0x2C, // Signed 40-bit integer
+  ZCL_INT48S_ATTRIBUTE_TYPE = 0x2D, // Signed 48-bit integer
+  ZCL_INT56S_ATTRIBUTE_TYPE = 0x2E, // Signed 56-bit integer
+  ZCL_INT64S_ATTRIBUTE_TYPE = 0x2F, // Signed 64-bit integer
+  ZCL_ENUM8_ATTRIBUTE_TYPE = 0x30, // 8-bit enumeration
+  ZCL_ENUM16_ATTRIBUTE_TYPE = 0x31, // 16-bit enumeration
+  ZCL_FLOAT_SEMI_ATTRIBUTE_TYPE = 0x38, // Semi-precision
+  ZCL_FLOAT_SINGLE_ATTRIBUTE_TYPE = 0x39, // Single precision
+  ZCL_FLOAT_DOUBLE_ATTRIBUTE_TYPE = 0x3A, // Double precision
+  ZCL_OCTET_STRING_ATTRIBUTE_TYPE = 0x41, // Octet string
+  ZCL_CHAR_STRING_ATTRIBUTE_TYPE = 0x42, // Character string
+  ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE = 0x43, // Long octet string
+  ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE = 0x44, // Long character string
+  ZCL_ARRAY_ATTRIBUTE_TYPE = 0x48, // Array
+  ZCL_STRUCT_ATTRIBUTE_TYPE = 0x4C, // Structure
+  ZCL_SET_ATTRIBUTE_TYPE = 0x50, // Set
+  ZCL_BAG_ATTRIBUTE_TYPE = 0x51, // Bag
+  ZCL_TIME_OF_DAY_ATTRIBUTE_TYPE = 0xE0, // Time of day
+  ZCL_DATE_ATTRIBUTE_TYPE = 0xE1, // Date
+  ZCL_UTC_TIME_ATTRIBUTE_TYPE = 0xE2, // UTC Time
+  ZCL_CLUSTER_ID_ATTRIBUTE_TYPE = 0xE8, // Cluster ID
+  ZCL_ATTRIBUTE_ID_ATTRIBUTE_TYPE = 0xE9, // Attribute ID
+  ZCL_BACNET_OID_ATTRIBUTE_TYPE = 0xEA, // BACnet OID
+  ZCL_IEEE_ADDRESS_ATTRIBUTE_TYPE = 0xF0, // IEEE address
+  ZCL_SECURITY_KEY_ATTRIBUTE_TYPE = 0xF1, // 128-bit security key
+  ZCL_ENDPOINT_ID_ATTRIBUTE_TYPE = 0xF2, // Endpoint Id
+  ZCL_GROUP_ID_ATTRIBUTE_TYPE = 0xF3, // Group Id
+  ZCL_COMMAND_ID_ATTRIBUTE_TYPE = 0xF4, // Command Id
+  ZCL_NODE_ID_ATTRIBUTE_TYPE = 0xF5, // Node Id
+  ZCL_DEVICE_TYPE_ID_ATTRIBUTE_TYPE = 0xF6, // Device Type Id
+  ZCL_UNKNOWN_ATTRIBUTE_TYPE = 0xFF, // Unknown
 };
diff --git a/src/darwin/Framework/CHIP/gen/call-command-handler.cpp b/src/darwin/Framework/CHIP/gen/call-command-handler.cpp
index 66538a88f18d42..b78ae9cdbd17f5 100644
--- a/src/darwin/Framework/CHIP/gen/call-command-handler.cpp
+++ b/src/darwin/Framework/CHIP/gen/call-command-handler.cpp
@@ -20,11 +20,11 @@
 #include <stdint.h>
 
 #include "af-structs.h"
-#include "app/util/util.h"
 #include "call-command-handler.h"
 #include "callback.h"
 #include "cluster-id.h"
 #include "command-id.h"
+#include "app/util/util.h"
 
 using namespace chip;
 
@@ -43,6 +43,7 @@ EmberAfStatus emberAfOnOffClusterClientCommandParse(EmberAfClusterCommand * cmd)
 EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd);
 EmberAfStatus emberAfTemperatureMeasurementClusterClientCommandParse(EmberAfClusterCommand * cmd);
 
+
 static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecific)
 {
     if (wasHandled)
@@ -63,6 +64,7 @@ static EmberAfStatus status(bool wasHandled, bool clusterExists, bool mfgSpecifi
     }
 }
 
+
 // Main command parsing controller.
 EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
 {
@@ -72,54 +74,54 @@ EmberAfStatus emberAfClusterSpecificCommandParse(EmberAfClusterCommand * cmd)
     {
         switch (cmd->apsFrame->clusterId)
         {
-        case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+        case ZCL_APPLICATION_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Application Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+        case ZCL_BARRIER_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Barrier Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BASIC_CLUSTER_ID:
+        case ZCL_BASIC_CLUSTER_ID :
             // No commands are enabled for cluster Basic
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_BINDING_CLUSTER_ID:
+        case ZCL_BINDING_CLUSTER_ID :
             // No commands are enabled for cluster Binding
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_COLOR_CONTROL_CLUSTER_ID:
+        case ZCL_COLOR_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Color Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_DOOR_LOCK_CLUSTER_ID:
+        case ZCL_DOOR_LOCK_CLUSTER_ID :
             result = emberAfDoorLockClusterClientCommandParse(cmd);
             break;
-        case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+        case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID :
             result = emberAfGeneralCommissioningClusterClientCommandParse(cmd);
             break;
-        case ZCL_GROUPS_CLUSTER_ID:
+        case ZCL_GROUPS_CLUSTER_ID :
             result = emberAfGroupsClusterClientCommandParse(cmd);
             break;
-        case ZCL_IDENTIFY_CLUSTER_ID:
+        case ZCL_IDENTIFY_CLUSTER_ID :
             result = emberAfIdentifyClusterClientCommandParse(cmd);
             break;
-        case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+        case ZCL_LEVEL_CONTROL_CLUSTER_ID :
             // No commands are enabled for cluster Level Control
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_LOW_POWER_CLUSTER_ID:
+        case ZCL_LOW_POWER_CLUSTER_ID :
             // No commands are enabled for cluster Low Power
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_ON_OFF_CLUSTER_ID:
+        case ZCL_ON_OFF_CLUSTER_ID :
             // No commands are enabled for cluster On/off
             result = status(false, true, cmd->mfgSpecific);
             break;
-        case ZCL_SCENES_CLUSTER_ID:
+        case ZCL_SCENES_CLUSTER_ID :
             result = emberAfScenesClusterClientCommandParse(cmd);
             break;
-        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+        case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
             // No commands are enabled for cluster Temperature Measurement
             result = status(false, true, cmd->mfgSpecific);
             break;
@@ -152,502 +154,498 @@ EmberAfStatus emberAfDoorLockClusterClientCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_CLEAR_ALL_PINS_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_ALL_RFIDS_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_PIN_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearPinResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearPinResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_RFID_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(status);
             break;
         }
         case ZCL_CLEAR_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(status);
             break;
         }
         case ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint8_t status;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-            uint8_t operatingModeDuringHoliday;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime  = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime,
-                                                                                  operatingModeDuringHoliday);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint8_t status;
+uint32_t localStartTime;
+uint32_t localEndTime;
+uint8_t operatingModeDuringHoliday;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  operatingModeDuringHoliday = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday);
             break;
         }
         case ZCL_GET_LOG_RECORD_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t logEntryId;
-            uint32_t timestamp;
-            uint8_t eventType;
-            uint8_t source;
-            uint8_t eventIdOrAlarmCode;
-            uint16_t userId;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            logEntryId    = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timestamp     = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            eventType     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            source        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            eventIdOrAlarmCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset      = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source,
-                                                                            eventIdOrAlarmCode, userId, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t logEntryId;
+uint32_t timestamp;
+uint8_t eventType;
+uint8_t source;
+uint8_t eventIdOrAlarmCode;
+uint16_t userId;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  logEntryId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timestamp = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  eventType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  source = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  eventIdOrAlarmCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin);
             break;
         }
         case ZCL_GET_PIN_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * pin;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, pin);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * pin;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  pin = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetPinResponseCallback(userId, userStatus, userType, pin);
             break;
         }
         case ZCL_GET_RFID_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userStatus;
-            uint8_t userType;
-            uint8_t * rfid;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userStatus    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            rfid = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, rfid);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userStatus;
+uint8_t userType;
+uint8_t * rfid;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userStatus = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  rfid = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(userId, userStatus, userType, rfid);
             break;
         }
         case ZCL_GET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t userId;
-            uint8_t userType;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t userId;
+uint8_t userType;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userType = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(userId, userType);
             break;
         }
         case ZCL_GET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint8_t status;
-            uint8_t daysMask;
-            uint8_t startHour;
-            uint8_t startMinute;
-            uint8_t endHour;
-            uint8_t endMinute;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            daysMask      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startHour     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            startMinute   = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endHour       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour,
-                                                                                  startMinute, endHour, endMinute);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint8_t status;
+uint8_t daysMask;
+uint8_t startHour;
+uint8_t startMinute;
+uint8_t endHour;
+uint8_t endMinute;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  daysMask = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  startMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endHour = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  endMinute = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(scheduleId, userId, status, daysMask, startHour, startMinute, endHour, endMinute);
             break;
         }
         case ZCL_GET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t scheduleId;
-            uint16_t userId;
-            uint8_t status;
-            uint32_t localStartTime;
-            uint32_t localEndTime;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            scheduleId    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            userId        = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset  = static_cast<uint16_t>(payloadOffset + 4);
-            if (cmd->bufLen < payloadOffset + 4)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled =
-                emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t scheduleId;
+uint16_t userId;
+uint8_t status;
+uint32_t localStartTime;
+uint32_t localEndTime;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  scheduleId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  userId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localStartTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 4);
+    if (cmd->bufLen < payloadOffset + 4)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  localEndTime = emberAfGetInt32u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterGetYeardayScheduleResponseCallback(scheduleId, userId, status, localStartTime, localEndTime);
             break;
         }
         case ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(status);
             break;
         }
         case ZCL_SET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(status);
             break;
         }
         case ZCL_SET_PIN_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetPinResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetPinResponseCallback(status);
             break;
         }
         case ZCL_SET_RFID_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(status);
             break;
         }
         case ZCL_SET_USER_TYPE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(status);
             break;
         }
         case ZCL_SET_WEEKDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(status);
             break;
         }
         case ZCL_SET_YEARDAY_SCHEDULE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(status);
             break;
         }
         case ZCL_UNLOCK_DOOR_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(status);
             break;
         }
         case ZCL_UNLOCK_WITH_TIMEOUT_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(status);
             break;
         }
         default: {
@@ -667,63 +665,63 @@ EmberAfStatus emberAfGeneralCommissioningClusterClientCommandParse(EmberAfCluste
         switch (cmd->commandId)
         {
         case ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t errorCode;
-            uint8_t * debugText;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            errorCode     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, debugText);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t errorCode;
+uint8_t * debugText;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  errorCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(errorCode, debugText);
             break;
         }
         case ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t errorCode;
-            uint8_t * debugText;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            errorCode     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, debugText);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t errorCode;
+uint8_t * debugText;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  errorCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(errorCode, debugText);
             break;
         }
         case ZCL_SET_FABRIC_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t errorCode;
-            uint8_t * debugText;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            errorCode     = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t errorCode;
+uint8_t * debugText;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  errorCode = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  debugText = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGeneralCommissioningClusterSetFabricResponseCallback(errorCode, debugText);
             break;
         }
         default: {
@@ -743,93 +741,93 @@ EmberAfStatus emberAfGroupsClusterClientCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_GROUP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterAddGroupResponseCallback(status, groupId);
             break;
         }
         case ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t capacity;
-            uint8_t groupCount;
-            /* TYPE WARNING: array array defaults to */ uint8_t * groupList;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            capacity      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupCount    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            groupList     = cmd->buffer + payloadOffset;
-
-            wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t capacity;
+uint8_t groupCount;
+/* TYPE WARNING: array array defaults to */ uint8_t *  groupList;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  capacity = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupCount = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    groupList = cmd->buffer + payloadOffset;
+
+wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(capacity, groupCount, groupList);
             break;
         }
         case ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(status, groupId);
             break;
         }
         case ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t * groupName;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1u)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfGroupsClusterViewGroupResponseCallback(status, groupId, groupName);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t * groupName;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfGroupsClusterViewGroupResponseCallback(status, groupId, groupName);
             break;
         }
         default: {
@@ -849,16 +847,16 @@ EmberAfStatus emberAfIdentifyClusterClientCommandParse(EmberAfClusterCommand * c
         switch (cmd->commandId)
         {
         case ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint16_t timeout;
-
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint16_t timeout;
+
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  timeout = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(timeout);
             break;
         }
         default: {
@@ -878,221 +876,220 @@ EmberAfStatus emberAfScenesClusterClientCommandParse(EmberAfClusterCommand * cmd
         switch (cmd->commandId)
         {
         case ZCL_ADD_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterAddSceneResponseCallback(status, groupId, sceneId);
             break;
         }
         case ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint8_t capacity;
-            uint16_t groupId;
-            uint8_t sceneCount;
-            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            capacity      = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (status == 0)
-            {
-                if (cmd->bufLen < payloadOffset + 1)
-                {
-                    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-                }
-                sceneCount    = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-                payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            }
-            else
-            {
-                sceneCount = UINT8_MAX;
-            }
-            if (status == 0)
-            {
-                sceneList = cmd->buffer + payloadOffset;
-            }
-            else
-            {
-                sceneList = NULL;
-            }
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint8_t capacity;
+uint16_t groupId;
+uint8_t sceneCount;
+/* TYPE WARNING: array array defaults to */ uint8_t *  sceneList;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  capacity = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+  if (status==0)
+{
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneCount = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+  }
+else
+{
+  sceneCount = UINT8_MAX;
+}
+if (status==0)
+{
+  sceneList = cmd->buffer + payloadOffset;
+}
+else
+{
+  sceneList = NULL;
+}
 
-            wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
+wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(status, capacity, groupId, sceneCount, sceneList);
             break;
         }
         case ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(status, groupId);
             break;
         }
         case ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(status, groupId, sceneId);
             break;
         }
         case ZCL_STORE_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-
-            wasHandled = emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+  
+wasHandled = emberAfScenesClusterStoreSceneResponseCallback(status, groupId, sceneId);
             break;
         }
         case ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID: {
-            uint16_t payloadOffset = cmd->payloadStartIndex;
-            uint8_t status;
-            uint16_t groupId;
-            uint8_t sceneId;
-            uint16_t transitionTime;
-            uint8_t * sceneName;
-            /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets;
-
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            status        = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (cmd->bufLen < payloadOffset + 2)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            groupId       = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
-            if (cmd->bufLen < payloadOffset + 1)
-            {
-                return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-            }
-            sceneId       = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
-            payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
-            if (status == 0)
-            {
-                if (cmd->bufLen < payloadOffset + 2)
-                {
-                    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-                }
-                transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
-                payloadOffset  = static_cast<uint16_t>(payloadOffset + 2);
-            }
-            else
-            {
-                transitionTime = UINT16_MAX;
-            }
-            if (status == 0)
-            {
-                if (cmd->bufLen < payloadOffset + 1u)
-                {
-                    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
-                }
-                sceneName     = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
-                payloadOffset = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
-            }
-            else
-            {
-                sceneName = NULL;
-            }
-            if (status == 0)
-            {
-                extensionFieldSets = cmd->buffer + payloadOffset;
-            }
-            else
-            {
-                extensionFieldSets = NULL;
-            }
+        uint16_t payloadOffset = cmd->payloadStartIndex;
+uint8_t status;
+uint16_t groupId;
+uint8_t sceneId;
+uint16_t transitionTime;
+uint8_t * sceneName;
+/* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets;
+
+  if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  status = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+    if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  groupId = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+    if (cmd->bufLen < payloadOffset + 1)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneId = emberAfGetInt8u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 1);
+  if (status==0)
+{
+  if (cmd->bufLen < payloadOffset + 2)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  transitionTime = emberAfGetInt16u(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + 2);
+  }
+else
+{
+  transitionTime = UINT16_MAX;
+}
+if (status==0)
+{
+  if (cmd->bufLen < payloadOffset + 1u)
+  {
+    return EMBER_ZCL_STATUS_MALFORMED_COMMAND;
+  }
+  sceneName = emberAfGetString(cmd->buffer, payloadOffset, cmd->bufLen);
+    payloadOffset = static_cast<uint16_t>(payloadOffset + emberAfStringLength(sceneName) + 1u);
+}
+else
+{
+  sceneName = NULL;
+}
+if (status==0)
+{
+  extensionFieldSets = cmd->buffer + payloadOffset;
+}
+else
+{
+  extensionFieldSets = NULL;
+}
 
-            wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName,
-                                                                       extensionFieldSets);
+wasHandled = emberAfScenesClusterViewSceneResponseCallback(status, groupId, sceneId, transitionTime, sceneName, extensionFieldSets);
             break;
         }
         default: {
diff --git a/src/darwin/Framework/CHIP/gen/callback-stub.cpp b/src/darwin/Framework/CHIP/gen/callback-stub.cpp
index 2e044efde235ed..a549e2e30c66c8 100644
--- a/src/darwin/Framework/CHIP/gen/callback-stub.cpp
+++ b/src/darwin/Framework/CHIP/gen/callback-stub.cpp
@@ -29,46 +29,46 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    case ZCL_APPLICATION_BASIC_CLUSTER_ID:
+     case ZCL_APPLICATION_BASIC_CLUSTER_ID :
         emberAfApplicationBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_BARRIER_CONTROL_CLUSTER_ID:
+     case ZCL_BARRIER_CONTROL_CLUSTER_ID :
         emberAfBarrierControlClusterInitCallback(endpoint);
         break;
-    case ZCL_BASIC_CLUSTER_ID:
+     case ZCL_BASIC_CLUSTER_ID :
         emberAfBasicClusterInitCallback(endpoint);
         break;
-    case ZCL_BINDING_CLUSTER_ID:
+     case ZCL_BINDING_CLUSTER_ID :
         emberAfBindingClusterInitCallback(endpoint);
         break;
-    case ZCL_COLOR_CONTROL_CLUSTER_ID:
+     case ZCL_COLOR_CONTROL_CLUSTER_ID :
         emberAfColorControlClusterInitCallback(endpoint);
         break;
-    case ZCL_DOOR_LOCK_CLUSTER_ID:
+     case ZCL_DOOR_LOCK_CLUSTER_ID :
         emberAfDoorLockClusterInitCallback(endpoint);
         break;
-    case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID:
+     case ZCL_GENERAL_COMMISSIONING_CLUSTER_ID :
         emberAfGeneralCommissioningClusterInitCallback(endpoint);
         break;
-    case ZCL_GROUPS_CLUSTER_ID:
+     case ZCL_GROUPS_CLUSTER_ID :
         emberAfGroupsClusterInitCallback(endpoint);
         break;
-    case ZCL_IDENTIFY_CLUSTER_ID:
+     case ZCL_IDENTIFY_CLUSTER_ID :
         emberAfIdentifyClusterInitCallback(endpoint);
         break;
-    case ZCL_LEVEL_CONTROL_CLUSTER_ID:
+     case ZCL_LEVEL_CONTROL_CLUSTER_ID :
         emberAfLevelControlClusterInitCallback(endpoint);
         break;
-    case ZCL_LOW_POWER_CLUSTER_ID:
+     case ZCL_LOW_POWER_CLUSTER_ID :
         emberAfLowPowerClusterInitCallback(endpoint);
         break;
-    case ZCL_ON_OFF_CLUSTER_ID:
+     case ZCL_ON_OFF_CLUSTER_ID :
         emberAfOnOffClusterInitCallback(endpoint);
         break;
-    case ZCL_SCENES_CLUSTER_ID:
+     case ZCL_SCENES_CLUSTER_ID :
         emberAfScenesClusterInitCallback(endpoint);
         break;
-    case ZCL_TEMP_MEASUREMENT_CLUSTER_ID:
+     case ZCL_TEMP_MEASUREMENT_CLUSTER_ID :
         emberAfTemperatureMeasurementClusterInitCallback(endpoint);
         break;
     default:
@@ -212,9 +212,10 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli
  * @param value   Ver.: always
  * @param type   Ver.: always
  */
-EmberAfAttributeWritePermission __attribute__((weak))
-emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
+EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                                          AttributeId attributeId, uint8_t mask,
+                                                                          uint16_t manufacturerCode, uint8_t * value, uint8_t type)
 {
     return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default
 }
@@ -229,8 +230,9 @@ emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId cluster
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeReadAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                        AttributeId attributeId)
 {
     return true;
 }
@@ -245,8 +247,9 @@ emberAfAttributeReadAccessCallback(EndpointId endpoint, ClusterId clusterId, uin
  * @param manufacturerCode   Ver.: always
  * @param attributeId   Ver.: always
  */
-bool __attribute__((weak))
-emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode, AttributeId attributeId)
+bool __attribute__((weak)) emberAfAttributeWriteAccessCallback(
+    EndpointId endpoint, ClusterId clusterId, uint16_t manufacturerCode,
+                                         AttributeId attributeId)
 {
     return true;
 }
@@ -263,7 +266,8 @@ emberAfAttributeWriteAccessCallback(EndpointId endpoint, ClusterId clusterId, ui
  * @param status Specifies either SUCCESS or the nature of the error that was
  * detected in the received command.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status)
+bool __attribute__((weak)) emberAfDefaultResponseCallback(
+    ClusterId clusterId, CommandId commandId, EmberAfStatus status)
 {
     return false;
 }
@@ -280,7 +284,8 @@ bool __attribute__((weak)) emberAfDefaultResponseCallback(ClusterId clusterId, C
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -297,7 +302,8 @@ bool __attribute__((weak)) emberAfConfigureReportingResponseCallback(ClusterId c
  * records.  Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -322,8 +328,9 @@ bool __attribute__((weak)) emberAfReadReportingConfigurationResponseCallback(Clu
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
-                                                                     uint16_t bufLen, bool extended)
+bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(
+    ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended)
 {
     return false;
 }
@@ -342,9 +349,9 @@ bool __attribute__((weak)) emberAfDiscoverAttributesResponseCallback(ClusterId c
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                 CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsGeneratedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                      CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -363,9 +370,9 @@ emberAfDiscoverCommandsGeneratedResponseCallback(ClusterId clusterId, uint16_t m
  * @param commandIdCount The length of bytes of the list, whish is the same as
  * the number of identifiers.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
-                                                CommandId * commandIds, uint16_t commandIdCount)
+bool __attribute__((weak)) emberAfDiscoverCommandsReceivedResponseCallback(
+    ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
+                                                     CommandId * commandIds, uint16_t commandIdCount)
 {
     return false;
 }
@@ -383,7 +390,8 @@ emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16_t ma
  *
  * @param cmd   Ver.: always
  */
-bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterCommand * cmd)
+bool __attribute__((weak)) emberAfPreCommandReceivedCallback(
+    EmberAfClusterCommand * cmd)
 {
     return false;
 }
@@ -407,7 +415,8 @@ bool __attribute__((weak)) emberAfPreCommandReceivedCallback(EmberAfClusterComma
  * @param status A pointer to the status code value that will be returned to the
  * caller.  Ver.: always
  */
-bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct * messageStruct, EmberStatus * status)
+bool __attribute__((weak)) emberAfPreMessageSendCallback(
+    EmberAfMessageStruct * messageStruct, EmberStatus * status)
 {
     return false;
 }
@@ -430,9 +439,10 @@ bool __attribute__((weak)) emberAfPreMessageSendCallback(EmberAfMessageStruct *
  * @param message   Ver.: always
  * @param status   Ver.: always
  */
-bool __attribute__((weak))
-emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen,
-                           uint8_t * message, EmberStatus status)
+bool __attribute__((weak)) emberAfMessageSentCallback(
+    EmberOutgoingMessageType type, uint64_t indexOrDestination,
+    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
+    EmberStatus status)
 {
     return false;
 }
@@ -454,9 +464,10 @@ emberAfMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestin
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                  uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
+EmberAfStatus __attribute__((weak)) emberAfPreAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+                                                uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+                                                uint8_t * value)
 {
     return EMBER_ZCL_STATUS_SUCCESS;
 }
@@ -476,10 +487,12 @@ emberAfPreAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Attr
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void __attribute__((weak))
-emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                   uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{}
+void __attribute__((weak)) emberAfPostAttributeChangeCallback(
+    EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
+    uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
+    uint8_t * value)
+{
+}
 
 /** @brief Read Attributes Response
  *
@@ -492,7 +505,8 @@ emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, Att
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReadAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -533,9 +547,10 @@ bool __attribute__((weak)) emberAfReadAttributesResponseCallback(ClusterId clust
  * @param buffer   Ver.: always
  * @param maxReadLength   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                     uint16_t manufacturerCode, uint8_t * buffer, uint16_t maxReadLength)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeReadCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                   EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                   uint8_t * buffer, uint16_t maxReadLength)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -551,7 +566,8 @@ emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId, E
  * Ver.: always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -602,9 +618,10 @@ bool __attribute__((weak)) emberAfWriteAttributesResponseCallback(ClusterId clus
  * @param manufacturerCode   Ver.: always
  * @param buffer   Ver.: always
  */
-EmberAfStatus __attribute__((weak))
-emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId, EmberAfAttributeMetadata * attributeMetadata,
-                                      uint16_t manufacturerCode, uint8_t * buffer)
+EmberAfStatus __attribute__((weak)) emberAfExternalAttributeWriteCallback(
+    EndpointId endpoint, ClusterId clusterId,
+                                                    EmberAfAttributeMetadata * attributeMetadata, uint16_t manufacturerCode,
+                                                    uint8_t * buffer)
 {
     return EMBER_ZCL_STATUS_FAILURE;
 }
@@ -620,7 +637,8 @@ emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
  * always
  * @param bufLen The length in bytes of the list.  Ver.: always
  */
-bool __attribute__((weak)) emberAfReportAttributesCallback(ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
+bool __attribute__((weak)) emberAfReportAttributesCallback(
+    ClusterId clusterId, uint8_t * buffer, uint16_t bufLen)
 {
     return false;
 }
@@ -656,8 +674,9 @@ uint32_t __attribute__((weak)) emberAfGetCurrentTimeCallback()
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool __attribute__((weak))
-emberAfGetEndpointInfoCallback(EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo)
+bool __attribute__((weak)) emberAfGetEndpointInfoCallback(
+    EndpointId endpoint, uint8_t * returnNetworkIndex,
+    EmberAfEndpointInfoStruct * returnEndpointInfo)
 {
     return false;
 }
@@ -692,8 +711,8 @@ void __attribute__((weak)) emberAfRegistrationAbortCallback() {}
  * always
  * @param message The message data received or to send.  Ver.: always
  */
-EmberStatus __attribute__((weak))
-emberAfInterpanSendMessageCallback(EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
+EmberStatus __attribute__((weak)) emberAfInterpanSendMessageCallback(
+    EmberAfInterpanHeader * header, uint16_t messageLength, uint8_t * message)
 {
     return EMBER_LIBRARY_NOT_PRESENT;
 }
diff --git a/src/darwin/Framework/CHIP/gen/callback.h b/src/darwin/Framework/CHIP/gen/callback.h
index 0de9f0dd4cae33..a8058f1e612420 100644
--- a/src/darwin/Framework/CHIP/gen/callback.h
+++ b/src/darwin/Framework/CHIP/gen/callback.h
@@ -39,6 +39,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
 
 // Cluster Init Functions
 
+
 /** @brief Application Basic Cluster Init
  *
  * Cluster Init
@@ -47,6 +48,7 @@ void emberAfClusterInitCallback(chip::EndpointId endpoint, chip::ClusterId clust
  */
 void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Barrier Control Cluster Init
  *
  * Cluster Init
@@ -55,6 +57,7 @@ void emberAfApplicationBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Basic Cluster Init
  *
  * Cluster Init
@@ -63,6 +66,7 @@ void emberAfBarrierControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Binding Cluster Init
  *
  * Cluster Init
@@ -71,6 +75,7 @@ void emberAfBasicClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfBindingClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Color Control Cluster Init
  *
  * Cluster Init
@@ -79,6 +84,7 @@ void emberAfBindingClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Door Lock Cluster Init
  *
  * Cluster Init
@@ -87,6 +93,7 @@ void emberAfColorControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief General Commissioning Cluster Init
  *
  * Cluster Init
@@ -95,6 +102,7 @@ void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGeneralCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Groups Cluster Init
  *
  * Cluster Init
@@ -103,6 +111,7 @@ void emberAfGeneralCommissioningClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Identify Cluster Init
  *
  * Cluster Init
@@ -111,6 +120,7 @@ void emberAfGroupsClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Level Control Cluster Init
  *
  * Cluster Init
@@ -119,6 +129,7 @@ void emberAfIdentifyClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Low Power Cluster Init
  *
  * Cluster Init
@@ -127,6 +138,7 @@ void emberAfLevelControlClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief On/off Cluster Init
  *
  * Cluster Init
@@ -135,6 +147,7 @@ void emberAfLowPowerClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Scenes Cluster Init
  *
  * Cluster Init
@@ -143,6 +156,7 @@ void emberAfOnOffClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
 
+
 /** @brief Temperature Measurement Cluster Init
  *
  * Cluster Init
@@ -151,8 +165,10 @@ void emberAfScenesClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfTemperatureMeasurementClusterInitCallback(chip::EndpointId endpoint);
 
+
 // Cluster Server/Client Init Functions
 
+
 //
 // Application Basic Cluster client
 //
@@ -182,9 +198,7 @@ void emberAfApplicationBasicClusterClientAttributeChangedCallback(chip::Endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                      chip::AttributeId attributeId,
-                                                                                      uint16_t manufacturerCode);
+void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Application Basic Cluster Client Message Sent
  *
@@ -197,9 +211,7 @@ void emberAfApplicationBasicClusterClientManufacturerSpecificAttributeChangedCal
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                             EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                             EmberStatus status);
+void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Application Basic Cluster Client Pre Attribute Changed
  *
@@ -211,10 +223,7 @@ void emberAfApplicationBasicClusterClientMessageSentCallback(EmberOutgoingMessag
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfApplicationBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              EmberAfAttributeType attributeType, uint8_t size,
-                                                                              uint8_t * value);
+EmberAfStatus emberAfApplicationBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Application Basic Cluster Client Tick
  *
@@ -253,9 +262,7 @@ void emberAfBarrierControlClusterClientAttributeChangedCallback(chip::EndpointId
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    uint16_t manufacturerCode);
+void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Barrier Control Cluster Client Message Sent
  *
@@ -268,9 +275,7 @@ void emberAfBarrierControlClusterClientManufacturerSpecificAttributeChangedCallb
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                           EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                           EmberStatus status);
+void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Barrier Control Cluster Client Pre Attribute Changed
  *
@@ -282,10 +287,7 @@ void emberAfBarrierControlClusterClientMessageSentCallback(EmberOutgoingMessageT
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBarrierControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            EmberAfAttributeType attributeType, uint8_t size,
-                                                                            uint8_t * value);
+EmberAfStatus emberAfBarrierControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Barrier Control Cluster Client Tick
  *
@@ -324,8 +326,7 @@ void emberAfBasicClusterClientAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Basic Cluster Client Message Sent
  *
@@ -338,8 +339,7 @@ void emberAfBasicClusterClientManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Basic Cluster Client Pre Attribute Changed
  *
@@ -351,9 +351,7 @@ void emberAfBasicClusterClientMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfBasicClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Basic Cluster Client Tick
  *
@@ -392,9 +390,7 @@ void emberAfBindingClusterClientAttributeChangedCallback(chip::EndpointId endpoi
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                             chip::AttributeId attributeId,
-                                                                             uint16_t manufacturerCode);
+void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Binding Cluster Client Message Sent
  *
@@ -407,9 +403,7 @@ void emberAfBindingClusterClientManufacturerSpecificAttributeChangedCallback(chi
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                    EmberStatus status);
+void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Binding Cluster Client Pre Attribute Changed
  *
@@ -421,9 +415,7 @@ void emberAfBindingClusterClientMessageSentCallback(EmberOutgoingMessageType typ
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfBindingClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                     EmberAfAttributeType attributeType, uint8_t size,
-                                                                     uint8_t * value);
+EmberAfStatus emberAfBindingClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Binding Cluster Client Tick
  *
@@ -462,9 +454,7 @@ void emberAfColorControlClusterClientAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Color Control Cluster Client Message Sent
  *
@@ -477,9 +467,7 @@ void emberAfColorControlClusterClientManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Color Control Cluster Client Pre Attribute Changed
  *
@@ -491,9 +479,7 @@ void emberAfColorControlClusterClientMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfColorControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfColorControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Color Control Cluster Client Tick
  *
@@ -532,9 +518,7 @@ void emberAfDoorLockClusterClientAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Door Lock Cluster Client Message Sent
  *
@@ -547,9 +531,7 @@ void emberAfDoorLockClusterClientManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Door Lock Cluster Client Pre Attribute Changed
  *
@@ -561,9 +543,7 @@ void emberAfDoorLockClusterClientMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfDoorLockClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfDoorLockClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Door Lock Cluster Client Tick
  *
@@ -602,9 +582,7 @@ void emberAfGeneralCommissioningClusterClientAttributeChangedCallback(chip::Endp
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                          chip::AttributeId attributeId,
-                                                                                          uint16_t manufacturerCode);
+void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief General Commissioning Cluster Client Message Sent
  *
@@ -617,9 +595,7 @@ void emberAfGeneralCommissioningClusterClientManufacturerSpecificAttributeChange
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                 EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                 EmberStatus status);
+void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief General Commissioning Cluster Client Pre Attribute Changed
  *
@@ -631,10 +607,7 @@ void emberAfGeneralCommissioningClusterClientMessageSentCallback(EmberOutgoingMe
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGeneralCommissioningClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  EmberAfAttributeType attributeType, uint8_t size,
-                                                                                  uint8_t * value);
+EmberAfStatus emberAfGeneralCommissioningClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief General Commissioning Cluster Client Tick
  *
@@ -673,9 +646,7 @@ void emberAfGroupsClusterClientAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Groups Cluster Client Message Sent
  *
@@ -688,9 +659,7 @@ void emberAfGroupsClusterClientManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Groups Cluster Client Pre Attribute Changed
  *
@@ -702,9 +671,7 @@ void emberAfGroupsClusterClientMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfGroupsClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfGroupsClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Groups Cluster Client Tick
  *
@@ -743,9 +710,7 @@ void emberAfIdentifyClusterClientAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Identify Cluster Client Message Sent
  *
@@ -758,9 +723,7 @@ void emberAfIdentifyClusterClientManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Identify Cluster Client Pre Attribute Changed
  *
@@ -772,9 +735,7 @@ void emberAfIdentifyClusterClientMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfIdentifyClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfIdentifyClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Identify Cluster Client Tick
  *
@@ -813,9 +774,7 @@ void emberAfLevelControlClusterClientAttributeChangedCallback(chip::EndpointId e
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                  chip::AttributeId attributeId,
-                                                                                  uint16_t manufacturerCode);
+void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Level Control Cluster Client Message Sent
  *
@@ -828,9 +787,7 @@ void emberAfLevelControlClusterClientManufacturerSpecificAttributeChangedCallbac
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                         EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                         EmberStatus status);
+void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Level Control Cluster Client Pre Attribute Changed
  *
@@ -842,9 +799,7 @@ void emberAfLevelControlClusterClientMessageSentCallback(EmberOutgoingMessageTyp
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLevelControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                          EmberAfAttributeType attributeType, uint8_t size,
-                                                                          uint8_t * value);
+EmberAfStatus emberAfLevelControlClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Level Control Cluster Client Tick
  *
@@ -883,9 +838,7 @@ void emberAfLowPowerClusterClientAttributeChangedCallback(chip::EndpointId endpo
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                              chip::AttributeId attributeId,
-                                                                              uint16_t manufacturerCode);
+void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Low Power Cluster Client Message Sent
  *
@@ -898,9 +851,7 @@ void emberAfLowPowerClusterClientManufacturerSpecificAttributeChangedCallback(ch
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                     EmberStatus status);
+void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Low Power Cluster Client Pre Attribute Changed
  *
@@ -912,9 +863,7 @@ void emberAfLowPowerClusterClientMessageSentCallback(EmberOutgoingMessageType ty
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfLowPowerClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                      EmberAfAttributeType attributeType, uint8_t size,
-                                                                      uint8_t * value);
+EmberAfStatus emberAfLowPowerClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Low Power Cluster Client Tick
  *
@@ -953,8 +902,7 @@ void emberAfOnOffClusterClientAttributeChangedCallback(chip::EndpointId endpoint
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                           uint16_t manufacturerCode);
+void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief On/off Cluster Client Message Sent
  *
@@ -967,8 +915,7 @@ void emberAfOnOffClusterClientManufacturerSpecificAttributeChangedCallback(chip:
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                  EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
+void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief On/off Cluster Client Pre Attribute Changed
  *
@@ -980,9 +927,7 @@ void emberAfOnOffClusterClientMessageSentCallback(EmberOutgoingMessageType type,
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfOnOffClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                   EmberAfAttributeType attributeType, uint8_t size,
-                                                                   uint8_t * value);
+EmberAfStatus emberAfOnOffClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief On/off Cluster Client Tick
  *
@@ -1021,9 +966,7 @@ void emberAfScenesClusterClientAttributeChangedCallback(chip::EndpointId endpoin
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                            chip::AttributeId attributeId,
-                                                                            uint16_t manufacturerCode);
+void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Scenes Cluster Client Message Sent
  *
@@ -1036,9 +979,7 @@ void emberAfScenesClusterClientManufacturerSpecificAttributeChangedCallback(chip
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                   EmberStatus status);
+void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Scenes Cluster Client Pre Attribute Changed
  *
@@ -1050,9 +991,7 @@ void emberAfScenesClusterClientMessageSentCallback(EmberOutgoingMessageType type
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfScenesClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId,
-                                                                    EmberAfAttributeType attributeType, uint8_t size,
-                                                                    uint8_t * value);
+EmberAfStatus emberAfScenesClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Scenes Cluster Client Tick
  *
@@ -1091,9 +1030,7 @@ void emberAfTemperatureMeasurementClusterClientAttributeChangedCallback(chip::En
  * @param attributeId       Attribute that changed
  * @param manufacturerCode  Manufacturer Code of the attribute that changed
  */
-void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                            chip::AttributeId attributeId,
-                                                                                            uint16_t manufacturerCode);
+void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, uint16_t manufacturerCode);
 
 /** @brief Temperature Measurement Cluster Client Message Sent
  *
@@ -1106,9 +1043,7 @@ void emberAfTemperatureMeasurementClusterClientManufacturerSpecificAttributeChan
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination,
-                                                                   EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                   EmberStatus status);
+void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoingMessageType type, uint64_t indexOrDestination, EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status);
 
 /** @brief Temperature Measurement Cluster Client Pre Attribute Changed
  *
@@ -1120,10 +1055,7 @@ void emberAfTemperatureMeasurementClusterClientMessageSentCallback(EmberOutgoing
  * @param size          Attribute size
  * @param value         Attribute value
  */
-EmberAfStatus emberAfTemperatureMeasurementClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                    chip::AttributeId attributeId,
-                                                                                    EmberAfAttributeType attributeType,
-                                                                                    uint8_t size, uint8_t * value);
+EmberAfStatus emberAfTemperatureMeasurementClusterClientPreAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId, EmberAfAttributeType attributeType, uint8_t size, uint8_t * value);
 
 /** @brief Temperature Measurement Cluster Client Tick
  *
@@ -1136,325 +1068,317 @@ void emberAfTemperatureMeasurementClusterClientTickCallback(chip::EndpointId end
 // Cluster Commands Callback
 
 /**
- * @brief Door Lock Cluster ClearAllPinsResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearAllPinsResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearAllPinsResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearAllRfidsResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearAllRfidsResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearAllRfidsResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearPinResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearPinResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearPinResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearRfidResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearRfidResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearRfidResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback
- * @param scheduleId
- * @param status
- * @param localStartTime
- * @param localEndTime
- * @param operatingModeDuringHoliday
- */
+* @brief Door Lock Cluster GetHolidayScheduleResponse Command callback
+* @param scheduleId
+* @param status
+* @param localStartTime
+* @param localEndTime
+* @param operatingModeDuringHoliday
+*/
 
-bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime,
-                                                              uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
+bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
 
 /**
- * @brief Door Lock Cluster GetLogRecordResponse Command callback
- * @param logEntryId
- * @param timestamp
- * @param eventType
- * @param source
- * @param eventIdOrAlarmCode
- * @param userId
- * @param pin
- */
-
-bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-                                                        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin);
+* @brief Door Lock Cluster GetLogRecordResponse Command callback
+* @param logEntryId
+* @param timestamp
+* @param eventType
+* @param source
+* @param eventIdOrAlarmCode
+* @param userId
+* @param pin
+*/
+
+bool emberAfDoorLockClusterGetLogRecordResponseCallback(uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin);
 
 /**
- * @brief Door Lock Cluster GetPinResponse Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param pin
- */
+* @brief Door Lock Cluster GetPinResponse Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param pin
+*/
 
 bool emberAfDoorLockClusterGetPinResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin);
 
 /**
- * @brief Door Lock Cluster GetRfidResponse Command callback
- * @param userId
- * @param userStatus
- * @param userType
- * @param rfid
- */
+* @brief Door Lock Cluster GetRfidResponse Command callback
+* @param userId
+* @param userStatus
+* @param userType
+* @param rfid
+*/
 
 bool emberAfDoorLockClusterGetRfidResponseCallback(uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid);
 
 /**
- * @brief Door Lock Cluster GetUserTypeResponse Command callback
- * @param userId
- * @param userType
- */
+* @brief Door Lock Cluster GetUserTypeResponse Command callback
+* @param userId
+* @param userType
+*/
 
 bool emberAfDoorLockClusterGetUserTypeResponseCallback(uint16_t userId, uint8_t userType);
 
 /**
- * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback
- * @param scheduleId
- * @param userId
- * @param status
- * @param daysMask
- * @param startHour
- * @param startMinute
- * @param endHour
- * @param endMinute
- */
-
-bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask,
-                                                              uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-                                                              uint8_t endMinute);
+* @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback
+* @param scheduleId
+* @param userId
+* @param status
+* @param daysMask
+* @param startHour
+* @param startMinute
+* @param endHour
+* @param endMinute
+*/
+
+bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
 /**
- * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback
- * @param scheduleId
- * @param userId
- * @param status
- * @param localStartTime
- * @param localEndTime
- */
+* @brief Door Lock Cluster GetYeardayScheduleResponse Command callback
+* @param scheduleId
+* @param userId
+* @param status
+* @param localStartTime
+* @param localEndTime
+*/
 
-bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status,
-                                                              uint32_t localStartTime, uint32_t localEndTime);
+bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime);
 
 /**
- * @brief Door Lock Cluster LockDoorResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster LockDoorResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterLockDoorResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetHolidayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetPinResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetPinResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetPinResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetRfidResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetRfidResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetRfidResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetUserTypeResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetUserTypeResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetUserTypeResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster SetYeardayScheduleResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster UnlockDoorResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster UnlockDoorResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterUnlockDoorResponseCallback(uint8_t status);
 
 /**
- * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback
- * @param status
- */
+* @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback
+* @param status
+*/
 
 bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(uint8_t status);
 
 /**
- * @brief General Commissioning Cluster ArmFailSafeResponse Command callback
- * @param errorCode
- * @param debugText
- */
+* @brief General Commissioning Cluster ArmFailSafeResponse Command callback
+* @param errorCode
+* @param debugText
+*/
 
 bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(uint8_t errorCode, uint8_t * debugText);
 
 /**
- * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback
- * @param errorCode
- * @param debugText
- */
+* @brief General Commissioning Cluster CommissioningCompleteResponse Command callback
+* @param errorCode
+* @param debugText
+*/
 
 bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(uint8_t errorCode, uint8_t * debugText);
 
 /**
- * @brief General Commissioning Cluster SetFabricResponse Command callback
- * @param errorCode
- * @param debugText
- */
+* @brief General Commissioning Cluster SetFabricResponse Command callback
+* @param errorCode
+* @param debugText
+*/
 
 bool emberAfGeneralCommissioningClusterSetFabricResponseCallback(uint8_t errorCode, uint8_t * debugText);
 
 /**
- * @brief Groups Cluster AddGroupResponse Command callback
- * @param status
- * @param groupId
- */
+* @brief Groups Cluster AddGroupResponse Command callback
+* @param status
+* @param groupId
+*/
 
 bool emberAfGroupsClusterAddGroupResponseCallback(uint8_t status, uint16_t groupId);
 
 /**
- * @brief Groups Cluster GetGroupMembershipResponse Command callback
- * @param capacity
- * @param groupCount
- * @param groupList
- */
+* @brief Groups Cluster GetGroupMembershipResponse Command callback
+* @param capacity
+* @param groupCount
+* @param groupList
+*/
 
-bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
+bool emberAfGroupsClusterGetGroupMembershipResponseCallback(uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList);
 
 /**
- * @brief Groups Cluster RemoveGroupResponse Command callback
- * @param status
- * @param groupId
- */
+* @brief Groups Cluster RemoveGroupResponse Command callback
+* @param status
+* @param groupId
+*/
 
 bool emberAfGroupsClusterRemoveGroupResponseCallback(uint8_t status, uint16_t groupId);
 
 /**
- * @brief Groups Cluster ViewGroupResponse Command callback
- * @param status
- * @param groupId
- * @param groupName
- */
+* @brief Groups Cluster ViewGroupResponse Command callback
+* @param status
+* @param groupId
+* @param groupName
+*/
 
 bool emberAfGroupsClusterViewGroupResponseCallback(uint8_t status, uint16_t groupId, uint8_t * groupName);
 
 /**
- * @brief Identify Cluster IdentifyQueryResponse Command callback
- * @param timeout
- */
+* @brief Identify Cluster IdentifyQueryResponse Command callback
+* @param timeout
+*/
 
 bool emberAfIdentifyClusterIdentifyQueryResponseCallback(uint16_t timeout);
 
 /**
- * @brief Scenes Cluster AddSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster AddSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterAddSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster GetSceneMembershipResponse Command callback
- * @param status
- * @param capacity
- * @param groupId
- * @param sceneCount
- * @param sceneList
- */
+* @brief Scenes Cluster GetSceneMembershipResponse Command callback
+* @param status
+* @param capacity
+* @param groupId
+* @param sceneCount
+* @param sceneList
+*/
 
-bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-                                                            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList);
+bool emberAfScenesClusterGetSceneMembershipResponseCallback(uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList);
 
 /**
- * @brief Scenes Cluster RemoveAllScenesResponse Command callback
- * @param status
- * @param groupId
- */
+* @brief Scenes Cluster RemoveAllScenesResponse Command callback
+* @param status
+* @param groupId
+*/
 
 bool emberAfScenesClusterRemoveAllScenesResponseCallback(uint8_t status, uint16_t groupId);
 
 /**
- * @brief Scenes Cluster RemoveSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster RemoveSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterRemoveSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster StoreSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- */
+* @brief Scenes Cluster StoreSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+*/
 
 bool emberAfScenesClusterStoreSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId);
 
 /**
- * @brief Scenes Cluster ViewSceneResponse Command callback
- * @param status
- * @param groupId
- * @param sceneId
- * @param transitionTime
- * @param sceneName
- * @param extensionFieldSets
- */
+* @brief Scenes Cluster ViewSceneResponse Command callback
+* @param status
+* @param groupId
+* @param sceneId
+* @param transitionTime
+* @param sceneName
+* @param extensionFieldSets
+*/
+
+bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets);
 
-bool emberAfScenesClusterViewSceneResponseCallback(uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                                                   uint8_t * sceneName,
-                                                   /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
 
 //
 // Non-Cluster Related Callbacks
@@ -1612,8 +1536,8 @@ bool emberAfReadReportingConfigurationResponseCallback(chip::ClusterId clusterId
  * @param extended Indicates whether the response is in the extended format or
  * not.  Ver.: always
  */
-bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer, uint16_t bufLen,
-                                               bool extended);
+bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool discoveryComplete, uint8_t * buffer,
+                                               uint16_t bufLen, bool extended);
 
 /** @brief Discover Commands Generated Response
  *
@@ -1632,6 +1556,7 @@ bool emberAfDiscoverAttributesResponseCallback(chip::ClusterId clusterId, bool d
 bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                       chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Discover Commands Received Response
  *
  * This function is called by the framework when Discover Commands Received
@@ -1649,6 +1574,7 @@ bool emberAfDiscoverCommandsGeneratedResponseCallback(chip::ClusterId clusterId,
 bool emberAfDiscoverCommandsReceivedResponseCallback(chip::ClusterId clusterId, uint16_t manufacturerCode, bool discoveryComplete,
                                                      chip::CommandId * commandIds, uint16_t commandIdCount);
 
+
 /** @brief Pre Command Received
  *
  * This callback is the second in the Application Framework's message processing
@@ -1742,8 +1668,8 @@ EmberAfStatus emberAfPreAttributeChangeCallback(chip::EndpointId endpoint, chip:
  * @param size   Ver.: always
  * @param value   Ver.: always
  */
-void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                        uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
+void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask,
+                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 
 /** @brief Read Attributes Response
  *
@@ -1902,8 +1828,7 @@ uint32_t emberAfGetCurrentTimeCallback();
  * @param returnEndpointInfo A pointer to a data struct that will be written
  * with information about the endpoint.  Ver.: always
  */
-bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex,
-                                    EmberAfEndpointInfoStruct * returnEndpointInfo);
+bool emberAfGetEndpointInfoCallback(chip::EndpointId endpoint, uint8_t * returnNetworkIndex, EmberAfEndpointInfoStruct * returnEndpointInfo);
 
 /** @brief Get Source Route Overhead
  *
diff --git a/src/darwin/Framework/CHIP/gen/client-command-macro.h b/src/darwin/Framework/CHIP/gen/client-command-macro.h
index e74766c68362e2..8c317ad02221a6 100644
--- a/src/darwin/Framework/CHIP/gen/client-command-macro.h
+++ b/src/darwin/Framework/CHIP/gen/client-command-macro.h
@@ -20,14 +20,23 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 /** @brief Command description for ReadAttributes
  *
  * Command: ReadAttributes
  * @param attributeIds ATTRIBUTE_ID []
  * @param attributeIdsLen int
  */
-#define emberAfFillCommandGlobalReadAttributes(clusterId, attributeIds, attributeIdsLen)                                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_COMMAND_ID, "b", attributeIds, attributeIdsLen);
+#define emberAfFillCommandGlobalReadAttributes(clusterId, \
+  attributeIds, attributeIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    attributeIds, attributeIdsLen \
+  );
 
 /** @brief Command description for ReadAttributesResponse
  *
@@ -35,9 +44,16 @@
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, readAttributeStatusRecords, readAttributeStatusRecordsLen)       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", readAttributeStatusRecords,           \
-                              readAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesResponse(clusterId, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributes
  *
@@ -45,9 +61,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributes(clusterId, writeAttributeRecords, writeAttributeRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_COMMAND_ID, "b", writeAttributeRecords,                        \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributes(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesUndivided
  *
@@ -55,9 +78,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, writeAttributeRecords, writeAttributeRecordsLen)               \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, "b", writeAttributeRecords,              \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesUndivided(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesResponse
  *
@@ -65,9 +95,16 @@
  * @param writeAttributeStatusRecords WriteAttributeStatusRecord []
  * @param writeAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, writeAttributeStatusRecords, writeAttributeStatusRecordsLen)    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, "b", writeAttributeStatusRecords,         \
-                              writeAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesResponse(clusterId, \
+  writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeStatusRecords, writeAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesNoResponse
  *
@@ -75,9 +112,16 @@
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, writeAttributeRecords, writeAttributeRecordsLen)              \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, "b", writeAttributeRecords,            \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesNoResponse(clusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReporting
  *
@@ -85,9 +129,16 @@
  * @param configureReportingRecords ConfigureReportingRecord []
  * @param configureReportingRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReporting(clusterId, configureReportingRecords, configureReportingRecordsLen)             \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_COMMAND_ID, "b", configureReportingRecords,                 \
-                              configureReportingRecordsLen);
+#define emberAfFillCommandGlobalConfigureReporting(clusterId, \
+  configureReportingRecords, configureReportingRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_COMMAND_ID, \
+    "b", \
+    configureReportingRecords, configureReportingRecordsLen \
+  );
 
 /** @brief Command description for ConfigureReportingResponse
  *
@@ -95,10 +146,16 @@
  * @param configureReportingStatusRecords ConfigureReportingStatusRecord []
  * @param configureReportingStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, configureReportingStatusRecords,                             \
-                                                           configureReportingStatusRecordsLen)                                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, "b", configureReportingStatusRecords,  \
-                              configureReportingStatusRecordsLen);
+#define emberAfFillCommandGlobalConfigureReportingResponse(clusterId, \
+  configureReportingStatusRecords, configureReportingStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_CONFIGURE_REPORTING_RESPONSE_COMMAND_ID, \
+    "b", \
+    configureReportingStatusRecords, configureReportingStatusRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfiguration
  *
@@ -106,10 +163,16 @@
  * @param readReportingConfigurationAttributeRecords ReadReportingConfigurationAttributeRecord []
  * @param readReportingConfigurationAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, readReportingConfigurationAttributeRecords,                  \
-                                                           readReportingConfigurationAttributeRecordsLen)                          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, "b",                                   \
-                              readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfiguration(clusterId, \
+  readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationAttributeRecords, readReportingConfigurationAttributeRecordsLen \
+  );
 
 /** @brief Command description for ReadReportingConfigurationResponse
  *
@@ -117,10 +180,16 @@
  * @param readReportingConfigurationRecords ReadReportingConfigurationRecord []
  * @param readReportingConfigurationRecordsLen int
  */
-#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, readReportingConfigurationRecords,                   \
-                                                                   readReportingConfigurationRecordsLen)                           \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, "b",                          \
-                              readReportingConfigurationRecords, readReportingConfigurationRecordsLen);
+#define emberAfFillCommandGlobalReadReportingConfigurationResponse(clusterId, \
+  readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_REPORTING_CONFIGURATION_RESPONSE_COMMAND_ID, \
+    "b", \
+    readReportingConfigurationRecords, readReportingConfigurationRecordsLen \
+  );
 
 /** @brief Command description for ReportAttributes
  *
@@ -128,39 +197,74 @@
  * @param reportAttributeRecords ReportAttributeRecord []
  * @param reportAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReportAttributes(clusterId, reportAttributeRecords, reportAttributeRecordsLen)                     \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_REPORT_ATTRIBUTES_COMMAND_ID, "b", reportAttributeRecords,                      \
-                              reportAttributeRecordsLen);
+#define emberAfFillCommandGlobalReportAttributes(clusterId, \
+  reportAttributeRecords, reportAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_REPORT_ATTRIBUTES_COMMAND_ID, \
+    "b", \
+    reportAttributeRecords, reportAttributeRecordsLen \
+  );
 
 /** @brief Command description for DefaultResponse
  *
  * Command: DefaultResponse
- * @param commandId INT8U
- * @param status Status
- */
-#define emberAfFillCommandGlobalDefaultResponse(clusterId, commandId, status)                                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DEFAULT_RESPONSE_COMMAND_ID, "uu", commandId, status);
+ * @param commandId INT8U 
+ * @param status Status 
+ */
+#define emberAfFillCommandGlobalDefaultResponse(clusterId, \
+  commandId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DEFAULT_RESPONSE_COMMAND_ID, \
+    "uu", \
+    commandId, \
+    status \
+  );
 
 /** @brief Command description for DiscoverAttributes
  *
  * Command: DiscoverAttributes
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, startId, maxAttributeIds)                                            \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributes(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesResponse
  *
  * Command: DiscoverAttributesResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param discoverAttributesInfoRecords DiscoverAttributesInfoRecord []
  * @param discoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, discoveryComplete, discoverAttributesInfoRecords,            \
-                                                           discoverAttributesInfoRecordsLen)                                       \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, "ub", discoveryComplete,               \
-                              discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesResponse(clusterId, \
+  discoveryComplete, \
+  discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    discoverAttributesInfoRecords, discoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for ReadAttributesStructured
  *
@@ -168,10 +272,16 @@
  * @param readStructuredAttributeRecords ReadStructuredAttributeRecord []
  * @param readStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, readStructuredAttributeRecords,                                \
-                                                         readStructuredAttributeRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", readStructuredAttributeRecords,     \
-                              readStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalReadAttributesStructured(clusterId, \
+  readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    readStructuredAttributeRecords, readStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructured
  *
@@ -179,10 +289,16 @@
  * @param writeStructuredAttributeRecords WriteStructuredAttributeRecord []
  * @param writeStructuredAttributeRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, writeStructuredAttributeRecords,                              \
-                                                          writeStructuredAttributeRecordsLen)                                      \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, "b", writeStructuredAttributeRecords,   \
-                              writeStructuredAttributeRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructured(clusterId, \
+  writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeRecords, writeStructuredAttributeRecordsLen \
+  );
 
 /** @brief Command description for WriteAttributesStructuredResponse
  *
@@ -190,3320 +306,5700 @@
  * @param writeStructuredAttributeStatusRecords WriteStructuredAttributeStatusRecord []
  * @param writeStructuredAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, writeStructuredAttributeStatusRecords,                \
-                                                                  writeStructuredAttributeStatusRecordsLen)                        \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, "b",                           \
-                              writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen);
+#define emberAfFillCommandGlobalWriteAttributesStructuredResponse(clusterId, \
+  writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID, \
+    "b", \
+    writeStructuredAttributeStatusRecords, writeStructuredAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsReceived
  *
  * Command: DiscoverCommandsReceived
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, startCommandId, maxCommandIds)                                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsReceived(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsReceivedResponse
  *
  * Command: DiscoverCommandsReceivedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)          \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,        \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsReceivedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_RECEIVED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverCommandsGenerated
  *
  * Command: DiscoverCommandsGenerated
- * @param startCommandId INT8U
- * @param maxCommandIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, startCommandId, maxCommandIds)                                \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, "uu", startCommandId, maxCommandIds);
+ * @param startCommandId INT8U 
+ * @param maxCommandIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverCommandsGenerated(clusterId, \
+  startCommandId, \
+  maxCommandIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_COMMAND_ID, \
+    "uu", \
+    startCommandId, \
+    maxCommandIds \
+  );
 
 /** @brief Command description for DiscoverCommandsGeneratedResponse
  *
  * Command: DiscoverCommandsGeneratedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, discoveryComplete, commandIds, commandIdsLen)         \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,       \
-                              commandIds, commandIdsLen);
+#define emberAfFillCommandGlobalDiscoverCommandsGeneratedResponse(clusterId, \
+  discoveryComplete, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_COMMANDS_GENERATED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for DiscoverAttributesExtended
  *
  * Command: DiscoverAttributesExtended
- * @param startId ATTRIBUTE_ID
- * @param maxAttributeIds INT8U
- */
-#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, startId, maxAttributeIds)                                    \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, "uu", startId, maxAttributeIds);
+ * @param startId ATTRIBUTE_ID 
+ * @param maxAttributeIds INT8U 
+ */
+#define emberAfFillCommandGlobalDiscoverAttributesExtended(clusterId, \
+  startId, \
+  maxAttributeIds \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID, \
+    "uu", \
+    startId, \
+    maxAttributeIds \
+  );
 
 /** @brief Command description for DiscoverAttributesExtendedResponse
  *
  * Command: DiscoverAttributesExtendedResponse
- * @param discoveryComplete INT8U
+ * @param discoveryComplete INT8U 
  * @param extendedDiscoverAttributesInfoRecords ExtendedDiscoverAttributesInfoRecord []
  * @param extendedDiscoverAttributesInfoRecordsLen int
  */
-#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(                                                                \
-    clusterId, discoveryComplete, extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen)                 \
-    emberAfFillExternalBuffer(mask, clusterId, ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, "ub", discoveryComplete,      \
-                              extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen);
+#define emberAfFillCommandGlobalDiscoverAttributesExtendedResponse(clusterId, \
+  discoveryComplete, \
+  extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+    clusterId,  \
+    ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID, \
+    "ub", \
+    discoveryComplete, \
+    extendedDiscoverAttributesInfoRecords, extendedDiscoverAttributesInfoRecordsLen \
+  );
 
 /** @brief Command description for Identify
  *
  * Command: Identify
- * @param identifyTime INT16U
- * @param timeout INT16U
- */
-#define emberAfFillCommandIdentifyClusterIdentify(identifyTime, timeout)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_COMMAND_ID, "uu", identifyTime, timeout);
+ * @param identifyTime INT16U 
+ * @param timeout INT16U 
+ */
+#define emberAfFillCommandIdentifyClusterIdentify( \
+  identifyTime, \
+  timeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_COMMAND_ID, \
+    "uu", \
+    identifyTime, \
+    timeout \
+  );
 
 /** @brief Command description for IdentifyQuery
  *
  * Command: IdentifyQuery
  */
-#define emberAfFillCommandIdentifyClusterIdentifyQuery()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_IDENTIFY_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandIdentifyClusterIdentifyQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EZModeInvoke
  *
  * Command: EZModeInvoke
- * @param action BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterEZModeInvoke(action)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EZ_MODE_INVOKE_COMMAND_ID, "u", action);
+ * @param action BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterEZModeInvoke( \
+  action \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EZ_MODE_INVOKE_COMMAND_ID, \
+    "u", \
+    action \
+  );
 
 /** @brief Command description for UpdateCommissionState
  *
  * Command: UpdateCommissionState
- * @param action ENUM8
- * @param commissionStateMask BITMAP8
- */
-#define emberAfFillCommandIdentifyClusterUpdateCommissionState(action, commissionStateMask)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, "uu", action, commissionStateMask);
+ * @param action ENUM8 
+ * @param commissionStateMask BITMAP8 
+ */
+#define emberAfFillCommandIdentifyClusterUpdateCommissionState( \
+  action, \
+  commissionStateMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMISSION_STATE_COMMAND_ID, \
+    "uu", \
+    action, \
+    commissionStateMask \
+  );
 
 /** @brief Command description for TriggerEffect
  *
  * Command: TriggerEffect
- * @param effectId IdentifyEffectIdentifier
- * @param effectVariant IdentifyEffectVariant
- */
-#define emberAfFillCommandIdentifyClusterTriggerEffect(effectId, effectVariant)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRIGGER_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId IdentifyEffectIdentifier 
+ * @param effectVariant IdentifyEffectVariant 
+ */
+#define emberAfFillCommandIdentifyClusterTriggerEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRIGGER_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for AddGroup
  *
  * Command: AddGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupName CHAR_STRING
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterAddGroup(groupId, status, groupName, groupId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_COMMAND_ID, "uuuu", groupId, status, groupName, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupName CHAR_STRING 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterAddGroup( \
+  groupId, \
+  status, \
+  groupName, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupName, \
+    groupId \
+  );
 
 /** @brief Command description for ViewGroup
  *
  * Command: ViewGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterViewGroup(groupId, status, groupId, groupName)                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_GROUP_COMMAND_ID, "uuuu", groupId, status, groupId, groupName);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterViewGroup( \
+  groupId, \
+  status, \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_GROUP_COMMAND_ID, \
+    "uuuu", \
+    groupId, \
+    status, \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for GetGroupMembership
  *
  * Command: GetGroupMembership
- * @param groupCount INT8U
- * @param capacity INT8U
+ * @param groupCount INT8U 
+ * @param capacity INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
- * @param groupCount INT8U
+ * @param groupCount INT8U 
  * @param groupList INT16U []
  * @param groupListLen int
  */
-#define emberAfFillCommandGroupsClusterGetGroupMembership(groupCount, capacity, groupList, groupListLen, groupCount, groupList,    \
-                                                          groupListLen)                                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, "uubub", groupCount, capacity, groupList, groupListLen,         \
-                              groupCount, groupList, groupListLen);
+#define emberAfFillCommandGroupsClusterGetGroupMembership( \
+  groupCount, \
+  capacity, \
+  groupList, groupListLen, \
+  groupCount, \
+  groupList, groupListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID, \
+    "uubub", \
+    groupCount, \
+    capacity, \
+    groupList, groupListLen, \
+    groupCount, \
+    groupList, groupListLen \
+  );
 
 /** @brief Command description for RemoveGroup
  *
  * Command: RemoveGroup
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandGroupsClusterRemoveGroup(groupId, status, groupId)                                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_GROUP_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandGroupsClusterRemoveGroup( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_GROUP_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for RemoveAllGroups
  *
  * Command: RemoveAllGroups
  */
-#define emberAfFillCommandGroupsClusterRemoveAllGroups()                                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, "", );
+#define emberAfFillCommandGroupsClusterRemoveAllGroups( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_GROUPS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for AddGroupIfIdentifying
  *
  * Command: AddGroupIfIdentifying
- * @param groupId INT16U
- * @param groupName CHAR_STRING
- */
-#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying(groupId, groupName)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, "uu", groupId, groupName);
+ * @param groupId INT16U 
+ * @param groupName CHAR_STRING 
+ */
+#define emberAfFillCommandGroupsClusterAddGroupIfIdentifying( \
+  groupId, \
+  groupName \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID, \
+    "uu", \
+    groupId, \
+    groupName \
+  );
 
 /** @brief Command description for AddScene
  *
  * Command: AddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,             \
-                                                extensionFieldSets, extensionFieldSetsLen)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime, sceneId,    \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for ViewScene
  *
  * Command: ViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,            \
-                                                 extensionFieldSets, extensionFieldSetsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId, transitionTime,   \
-                              sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for RemoveScene
  *
  * Command: RemoveScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterRemoveScene(groupId, status, sceneId, groupId, sceneId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterRemoveScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RemoveAllScenes
  *
  * Command: RemoveAllScenes
- * @param groupId INT16U
- * @param status Status
- * @param groupId INT16U
- */
-#define emberAfFillCommandScenesClusterRemoveAllScenes(groupId, status, groupId)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REMOVE_ALL_SCENES_COMMAND_ID, "uuu", groupId, status, groupId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param groupId INT16U 
+ */
+#define emberAfFillCommandScenesClusterRemoveAllScenes( \
+  groupId, \
+  status, \
+  groupId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_ALL_SCENES_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    status, \
+    groupId \
+  );
 
 /** @brief Command description for StoreScene
  *
  * Command: StoreScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- */
-#define emberAfFillCommandScenesClusterStoreScene(groupId, status, sceneId, groupId, sceneId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STORE_SCENE_COMMAND_ID, "uuuuu", groupId, status, sceneId, groupId, sceneId);
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ */
+#define emberAfFillCommandScenesClusterStoreScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STORE_SCENE_COMMAND_ID, \
+    "uuuuu", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId \
+  );
 
 /** @brief Command description for RecallScene
  *
  * Command: RecallScene
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandScenesClusterRecallScene(groupId, sceneId, transitionTime)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RECALL_SCENE_COMMAND_ID, "uuu", groupId, sceneId, transitionTime);
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandScenesClusterRecallScene( \
+  groupId, \
+  sceneId, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECALL_SCENE_COMMAND_ID, \
+    "uuu", \
+    groupId, \
+    sceneId, \
+    transitionTime \
+  );
 
 /** @brief Command description for GetSceneMembership
  *
  * Command: GetSceneMembership
- * @param groupId INT16U
- * @param status Status
- * @param capacity INT8U
- * @param groupId INT16U
- * @param sceneCount INT8U
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param capacity INT8U 
+ * @param groupId INT16U 
+ * @param sceneCount INT8U 
  * @param sceneList INT8U []
  * @param sceneListLen int
  */
-#define emberAfFillCommandScenesClusterGetSceneMembership(groupId, status, capacity, groupId, sceneCount, sceneList, sceneListLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, "uuuuub", groupId, status, capacity, groupId, sceneCount,       \
-                              sceneList, sceneListLen);
+#define emberAfFillCommandScenesClusterGetSceneMembership( \
+  groupId, \
+  status, \
+  capacity, \
+  groupId, \
+  sceneCount, \
+  sceneList, sceneListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID, \
+    "uuuuub", \
+    groupId, \
+    status, \
+    capacity, \
+    groupId, \
+    sceneCount, \
+    sceneList, sceneListLen \
+  );
 
 /** @brief Command description for EnhancedAddScene
  *
  * Command: EnhancedAddScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param transitionTime INT16U
- * @param sceneId INT8U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param transitionTime INT16U 
+ * @param sceneId INT8U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedAddScene(groupId, status, sceneId, groupId, transitionTime, sceneId, sceneName,     \
-                                                        extensionFieldSets, extensionFieldSetsLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, transitionTime,    \
-                              sceneId, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedAddScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  transitionTime, \
+  sceneId, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_ADD_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    transitionTime, \
+    sceneId, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for EnhancedViewScene
  *
  * Command: EnhancedViewScene
- * @param groupId INT16U
- * @param status Status
- * @param sceneId INT8U
- * @param groupId INT16U
- * @param sceneId INT8U
- * @param transitionTime INT16U
- * @param sceneName CHAR_STRING
+ * @param groupId INT16U 
+ * @param status Status 
+ * @param sceneId INT8U 
+ * @param groupId INT16U 
+ * @param sceneId INT8U 
+ * @param transitionTime INT16U 
+ * @param sceneName CHAR_STRING 
  * @param extensionFieldSets SceneExtensionFieldSet []
  * @param extensionFieldSetsLen int
  */
-#define emberAfFillCommandScenesClusterEnhancedViewScene(groupId, status, sceneId, groupId, sceneId, transitionTime, sceneName,    \
-                                                         extensionFieldSets, extensionFieldSetsLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, "uuuuuuub", groupId, status, sceneId, groupId, sceneId,          \
-                              transitionTime, sceneName, extensionFieldSets, extensionFieldSetsLen);
+#define emberAfFillCommandScenesClusterEnhancedViewScene( \
+  groupId, \
+  status, \
+  sceneId, \
+  groupId, \
+  sceneId, \
+  transitionTime, \
+  sceneName, \
+  extensionFieldSets, extensionFieldSetsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID, \
+    "uuuuuuub", \
+    groupId, \
+    status, \
+    sceneId, \
+    groupId, \
+    sceneId, \
+    transitionTime, \
+    sceneName, \
+    extensionFieldSets, extensionFieldSetsLen \
+  );
 
 /** @brief Command description for CopyScene
  *
  * Command: CopyScene
- * @param mode ScenesCopyMode
- * @param status Status
- * @param groupIdFrom INT16U
- * @param groupIdFrom INT16U
- * @param sceneIdFrom INT8U
- * @param sceneIdFrom INT8U
- * @param groupIdTo INT16U
- * @param sceneIdTo INT8U
- */
-#define emberAfFillCommandScenesClusterCopyScene(mode, status, groupIdFrom, groupIdFrom, sceneIdFrom, sceneIdFrom, groupIdTo,      \
-                                                 sceneIdTo)                                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_COPY_SCENE_COMMAND_ID, "uuuuuuuu", mode, status, groupIdFrom, groupIdFrom, sceneIdFrom,          \
-                              sceneIdFrom, groupIdTo, sceneIdTo);
+ * @param mode ScenesCopyMode 
+ * @param status Status 
+ * @param groupIdFrom INT16U 
+ * @param groupIdFrom INT16U 
+ * @param sceneIdFrom INT8U 
+ * @param sceneIdFrom INT8U 
+ * @param groupIdTo INT16U 
+ * @param sceneIdTo INT8U 
+ */
+#define emberAfFillCommandScenesClusterCopyScene( \
+  mode, \
+  status, \
+  groupIdFrom, \
+  groupIdFrom, \
+  sceneIdFrom, \
+  sceneIdFrom, \
+  groupIdTo, \
+  sceneIdTo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COPY_SCENE_COMMAND_ID, \
+    "uuuuuuuu", \
+    mode, \
+    status, \
+    groupIdFrom, \
+    groupIdFrom, \
+    sceneIdFrom, \
+    sceneIdFrom, \
+    groupIdTo, \
+    sceneIdTo \
+  );
 
 /** @brief Command description for Off
  *
  * Command: Off
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOff() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for On
  *
  * Command: On
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOn() emberAfFillExternalBuffer(mask,                                                                             \
-                                                                                                                                   \
-                                                 ZCL_ON_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOn( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterToggle() emberAfFillExternalBuffer(mask,                                                                         \
-                                                                                                                                   \
-                                                     ZCL_TOGGLE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterToggle( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OffWithEffect
  *
  * Command: OffWithEffect
- * @param effectId OnOffEffectIdentifier
- * @param effectVariant ENUM8
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOffWithEffect(effectId, effectVariant)                                                                           \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_OFF_WITH_EFFECT_COMMAND_ID, "uu", effectId, effectVariant);
+ * @param effectId OnOffEffectIdentifier 
+ * @param effectVariant ENUM8 
+ */
+#define emberAfFillCommandOn/offClusterOffWithEffect( \
+  effectId, \
+  effectVariant \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OFF_WITH_EFFECT_COMMAND_ID, \
+    "uu", \
+    effectId, \
+    effectVariant \
+  );
 
 /** @brief Command description for OnWithRecallGlobalScene
  *
  * Command: OnWithRecallGlobalScene
  */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithRecallGlobalScene() emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, "", );
+#define emberAfFillCommandOn/offClusterOnWithRecallGlobalScene( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OnWithTimedOff
  *
  * Command: OnWithTimedOff
- * @param onOffControl OnOffControl
- * @param onTime INT16U
- * @param offWaitTime INT16U
- */
-#define emberAfFillCommandOn                                                                                                       \
-    /                                                                                                                              \
-        offClusterOnWithTimedOff(onOffControl, onTime, offWaitTime)                                                                \
-            emberAfFillExternalBuffer(mask,                                                                                        \
-                                                                                                                                   \
-                                      ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, "uuu", onOffControl, onTime, offWaitTime);
+ * @param onOffControl OnOffControl 
+ * @param onTime INT16U 
+ * @param offWaitTime INT16U 
+ */
+#define emberAfFillCommandOn/offClusterOnWithTimedOff( \
+  onOffControl, \
+  onTime, \
+  offWaitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ON_WITH_TIMED_OFF_COMMAND_ID, \
+    "uuu", \
+    onOffControl, \
+    onTime, \
+    offWaitTime \
+  );
 
 /** @brief Command description for MoveToLevel
  *
  * Command: MoveToLevel
- * @param level INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevel(level, transitionTime, optionMask, optionOverride)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_COMMAND_ID, "uuuu", level, transitionTime, optionMask, optionOverride);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevel( \
+  level, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_COMMAND_ID, \
+    "uuuu", \
+    level, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Move
  *
  * Command: Move
- * @param moveMode MoveMode
- * @param rate INT8U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMove(moveMode, rate, optionMask, optionOverride)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COMMAND_ID, "uuuu", moveMode, rate, optionMask, optionOverride);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterMove( \
+  moveMode, \
+  rate, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Step
  *
  * Command: Step
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStep(stepMode, stepSize, transitionTime, optionMask, optionOverride)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionMask, optionOverride);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStep( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for Stop
  *
  * Command: Stop
- * @param optionMask BITMAP8
- * @param optionOverride BITMAP8
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStop(optionMask, optionOverride)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_COMMAND_ID, "uu", optionMask, optionOverride);
+ * @param optionMask BITMAP8 
+ * @param optionOverride BITMAP8 
+ */
+#define emberAfFillCommandLevel ControlClusterStop( \
+  optionMask, \
+  optionOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_COMMAND_ID, \
+    "uu", \
+    optionMask, \
+    optionOverride \
+  );
 
 /** @brief Command description for MoveToLevelWithOnOff
  *
  * Command: MoveToLevelWithOnOff
- * @param level INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveToLevelWithOnOff(level, transitionTime)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, "uu", level, transitionTime);
+ * @param level INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveToLevelWithOnOff( \
+  level, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    level, \
+    transitionTime \
+  );
 
 /** @brief Command description for MoveWithOnOff
  *
  * Command: MoveWithOnOff
- * @param moveMode MoveMode
- * @param rate INT8U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterMoveWithOnOff(moveMode, rate) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode MoveMode 
+ * @param rate INT8U 
+ */
+#define emberAfFillCommandLevel ControlClusterMoveWithOnOff( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for StepWithOnOff
  *
  * Command: StepWithOnOff
- * @param stepMode StepMode
- * @param stepSize INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStepWithOnOff(stepMode, stepSize, transitionTime)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_WITH_ON_OFF_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode StepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandLevel ControlClusterStepWithOnOff( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_WITH_ON_OFF_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for StopWithOnOff
  *
  * Command: StopWithOnOff
  */
-#define emberAfFillCommandLevel                                                                                                    \
-    ControlClusterStopWithOnOff() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_STOP_WITH_ON_OFF_COMMAND_ID, "", );
+#define emberAfFillCommandLevel ControlClusterStopWithOnOff( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_WITH_ON_OFF_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarm
  *
  * Command: ResetAlarm
- * @param alarmCode ENUM8
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandAlarmsClusterResetAlarm(alarmCode, alarmCode, clusterId, clusterId)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_COMMAND_ID, "uuuu", alarmCode, alarmCode, clusterId, clusterId);
+ * @param alarmCode ENUM8 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandAlarmsClusterResetAlarm( \
+  alarmCode, \
+  alarmCode, \
+  clusterId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_COMMAND_ID, \
+    "uuuu", \
+    alarmCode, \
+    alarmCode, \
+    clusterId, \
+    clusterId \
+  );
 
 /** @brief Command description for ResetAllAlarms
  *
  * Command: ResetAllAlarms
- * @param status Status
- * @param alarmCode ENUM8
- * @param clusterId CLUSTER_ID
- * @param timeStamp INT32U
- */
-#define emberAfFillCommandAlarmsClusterResetAllAlarms(status, alarmCode, clusterId, timeStamp)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALL_ALARMS_COMMAND_ID, "uuuu", status, alarmCode, clusterId, timeStamp);
+ * @param status Status 
+ * @param alarmCode ENUM8 
+ * @param clusterId CLUSTER_ID 
+ * @param timeStamp INT32U 
+ */
+#define emberAfFillCommandAlarmsClusterResetAllAlarms( \
+  status, \
+  alarmCode, \
+  clusterId, \
+  timeStamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALL_ALARMS_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    alarmCode, \
+    clusterId, \
+    timeStamp \
+  );
 
 /** @brief Command description for GetAlarm
  *
  * Command: GetAlarm
  */
-#define emberAfFillCommandAlarmsClusterGetAlarm()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_ALARM_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterGetAlarm( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALARM_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResetAlarmLog
  *
  * Command: ResetAlarmLog
  */
-#define emberAfFillCommandAlarmsClusterResetAlarmLog()                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_ALARM_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandAlarmsClusterResetAlarmLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_ALARM_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetAbsoluteLocation
  *
  * Command: SetAbsoluteLocation
- * @param coordinate1 INT16S
- * @param status Status
- * @param coordinate2 INT16S
- * @param power INT16S
- * @param coordinate3 INT16S
- * @param pathLossExponent INT16U
- * @param power INT16S
- * @param calculationPeriod INT16U
- * @param pathLossExponent INT16U
- * @param numberRssiMeasurements INT8U
- * @param reportingPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetAbsoluteLocation(coordinate1, status, coordinate2, power, coordinate3, pathLossExponent, power,              \
-                                       calculationPeriod, pathLossExponent, numberRssiMeasurements, reportingPeriod)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, "uuuuuuuuuuu", coordinate1, status, coordinate2, power,    \
-                                  coordinate3, pathLossExponent, power, calculationPeriod, pathLossExponent,                       \
-                                  numberRssiMeasurements, reportingPeriod);
+ * @param coordinate1 INT16S 
+ * @param status Status 
+ * @param coordinate2 INT16S 
+ * @param power INT16S 
+ * @param coordinate3 INT16S 
+ * @param pathLossExponent INT16U 
+ * @param power INT16S 
+ * @param calculationPeriod INT16U 
+ * @param pathLossExponent INT16U 
+ * @param numberRssiMeasurements INT8U 
+ * @param reportingPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetAbsoluteLocation( \
+  coordinate1, \
+  status, \
+  coordinate2, \
+  power, \
+  coordinate3, \
+  pathLossExponent, \
+  power, \
+  calculationPeriod, \
+  pathLossExponent, \
+  numberRssiMeasurements, \
+  reportingPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    coordinate1, \
+    status, \
+    coordinate2, \
+    power, \
+    coordinate3, \
+    pathLossExponent, \
+    power, \
+    calculationPeriod, \
+    pathLossExponent, \
+    numberRssiMeasurements, \
+    reportingPeriod \
+  );
 
 /** @brief Command description for SetDeviceConfiguration
  *
  * Command: SetDeviceConfiguration
- * @param power INT16S
- * @param status Status
- * @param pathLossExponent INT16U
- * @param locationType LocationType
- * @param calculationPeriod INT16U
- * @param coordinate1 INT16S
- * @param numberRssiMeasurements INT8U
- * @param coordinate2 INT16S
- * @param reportingPeriod INT16U
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterSetDeviceConfiguration(power, status, pathLossExponent, locationType, calculationPeriod, coordinate1,           \
-                                          numberRssiMeasurements, coordinate2, reportingPeriod, coordinate3, power,                \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuuuuuuu", power, status, pathLossExponent,     \
-                                  locationType, calculationPeriod, coordinate1, numberRssiMeasurements, coordinate2,               \
-                                  reportingPeriod, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure,           \
-                                  locationAge);
+ * @param power INT16S 
+ * @param status Status 
+ * @param pathLossExponent INT16U 
+ * @param locationType LocationType 
+ * @param calculationPeriod INT16U 
+ * @param coordinate1 INT16S 
+ * @param numberRssiMeasurements INT8U 
+ * @param coordinate2 INT16S 
+ * @param reportingPeriod INT16U 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterSetDeviceConfiguration( \
+  power, \
+  status, \
+  pathLossExponent, \
+  locationType, \
+  calculationPeriod, \
+  coordinate1, \
+  numberRssiMeasurements, \
+  coordinate2, \
+  reportingPeriod, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    power, \
+    status, \
+    pathLossExponent, \
+    locationType, \
+    calculationPeriod, \
+    coordinate1, \
+    numberRssiMeasurements, \
+    coordinate2, \
+    reportingPeriod, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetDeviceConfiguration
  *
  * Command: GetDeviceConfiguration
- * @param targetAddress IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param power INT16S
- * @param pathLossExponent INT16U
- * @param locationMethod LocationMethod
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetDeviceConfiguration(targetAddress, locationType, coordinate1, coordinate2, coordinate3, power,               \
-                                          pathLossExponent, locationMethod, qualityMeasure, locationAge)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, "uuuuuuuuuu", targetAddress, locationType, coordinate1, \
-                                  coordinate2, coordinate3, power, pathLossExponent, locationMethod, qualityMeasure, locationAge);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param power INT16S 
+ * @param pathLossExponent INT16U 
+ * @param locationMethod LocationMethod 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetDeviceConfiguration( \
+  targetAddress, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  power, \
+  pathLossExponent, \
+  locationMethod, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEVICE_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    targetAddress, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    power, \
+    pathLossExponent, \
+    locationMethod, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for GetLocationData
  *
  * Command: GetLocationData
- * @param flags GetLocationDataFlags
- * @param locationType LocationType
- * @param numberResponses INT8U
- * @param coordinate1 INT16S
- * @param targetAddress IEEE_ADDRESS
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param qualityMeasure INT8U
- * @param locationAge INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterGetLocationData(flags, locationType, numberResponses, coordinate1, targetAddress, coordinate2, coordinate3,     \
-                                   qualityMeasure, locationAge)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOCATION_DATA_COMMAND_ID, "uuuuuuuuu", flags, locationType, numberResponses,             \
-                                  coordinate1, targetAddress, coordinate2, coordinate3, qualityMeasure, locationAge);
+ * @param flags GetLocationDataFlags 
+ * @param locationType LocationType 
+ * @param numberResponses INT8U 
+ * @param coordinate1 INT16S 
+ * @param targetAddress IEEE_ADDRESS 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param qualityMeasure INT8U 
+ * @param locationAge INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterGetLocationData( \
+  flags, \
+  locationType, \
+  numberResponses, \
+  coordinate1, \
+  targetAddress, \
+  coordinate2, \
+  coordinate3, \
+  qualityMeasure, \
+  locationAge \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOCATION_DATA_COMMAND_ID, \
+    "uuuuuuuuu", \
+    flags, \
+    locationType, \
+    numberResponses, \
+    coordinate1, \
+    targetAddress, \
+    coordinate2, \
+    coordinate3, \
+    qualityMeasure, \
+    locationAge \
+  );
 
 /** @brief Command description for RssiResponse
  *
  * Command: RssiResponse
- * @param replyingDevice IEEE_ADDRESS
- * @param locationType LocationType
- * @param coordinate1 INT16S
- * @param coordinate2 INT16S
- * @param coordinate3 INT16S
- * @param rssi INT8S
- * @param numberRssiMeasurements INT8U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiResponse(replyingDevice, locationType, coordinate1, coordinate2, coordinate3, rssi, numberRssiMeasurements) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_RESPONSE_COMMAND_ID, "uuuuuuu", replyingDevice, locationType, coordinate1, coordinate2, \
-                                  coordinate3, rssi, numberRssiMeasurements);
+ * @param replyingDevice IEEE_ADDRESS 
+ * @param locationType LocationType 
+ * @param coordinate1 INT16S 
+ * @param coordinate2 INT16S 
+ * @param coordinate3 INT16S 
+ * @param rssi INT8S 
+ * @param numberRssiMeasurements INT8U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiResponse( \
+  replyingDevice, \
+  locationType, \
+  coordinate1, \
+  coordinate2, \
+  coordinate3, \
+  rssi, \
+  numberRssiMeasurements \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_RESPONSE_COMMAND_ID, \
+    "uuuuuuu", \
+    replyingDevice, \
+    locationType, \
+    coordinate1, \
+    coordinate2, \
+    coordinate3, \
+    rssi, \
+    numberRssiMeasurements \
+  );
 
 /** @brief Command description for RssiRequest
  *
  * Command: RssiRequest
- * @param targetAddress IEEE_ADDRESS
- * @param numberRssiMeasurements INT8U
- * @param calculationPeriod INT16U
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRssiRequest(targetAddress, numberRssiMeasurements, calculationPeriod)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RSSI_REQUEST_COMMAND_ID, "uuu", targetAddress, numberRssiMeasurements, calculationPeriod);
+ * @param targetAddress IEEE_ADDRESS 
+ * @param numberRssiMeasurements INT8U 
+ * @param calculationPeriod INT16U 
+ */
+#define emberAfFillCommandRSSI LocationClusterRssiRequest( \
+  targetAddress, \
+  numberRssiMeasurements, \
+  calculationPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RSSI_REQUEST_COMMAND_ID, \
+    "uuu", \
+    targetAddress, \
+    numberRssiMeasurements, \
+    calculationPeriod \
+  );
 
 /** @brief Command description for AnchorNodeAnnounce
  *
  * Command: AnchorNodeAnnounce
- * @param anchorNodeIeeeAddress IEEE_ADDRESS
- * @param measuringDevice IEEE_ADDRESS
- * @param coordinate1 INT16S
- * @param neighbors INT8U
- * @param coordinate2 INT16S
+ * @param anchorNodeIeeeAddress IEEE_ADDRESS 
+ * @param measuringDevice IEEE_ADDRESS 
+ * @param coordinate1 INT16S 
+ * @param neighbors INT8U 
+ * @param coordinate2 INT16S 
  * @param neighborsInfo NeighborInfo []
  * @param neighborsInfoLen int
- * @param coordinate3 INT16S
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterAnchorNodeAnnounce(anchorNodeIeeeAddress, measuringDevice, coordinate1, neighbors, coordinate2, neighborsInfo,  \
-                                      neighborsInfoLen, coordinate3)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, "uuuuubu", anchorNodeIeeeAddress, measuringDevice,          \
-                                  coordinate1, neighbors, coordinate2, neighborsInfo, neighborsInfoLen, coordinate3);
+ * @param coordinate3 INT16S 
+ */
+#define emberAfFillCommandRSSI LocationClusterAnchorNodeAnnounce( \
+  anchorNodeIeeeAddress, \
+  measuringDevice, \
+  coordinate1, \
+  neighbors, \
+  coordinate2, \
+  neighborsInfo, neighborsInfoLen, \
+  coordinate3 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ANCHOR_NODE_ANNOUNCE_COMMAND_ID, \
+    "uuuuubu", \
+    anchorNodeIeeeAddress, \
+    measuringDevice, \
+    coordinate1, \
+    neighbors, \
+    coordinate2, \
+    neighborsInfo, neighborsInfoLen, \
+    coordinate3 \
+  );
 
 /** @brief Command description for RequestOwnLocation
  *
  * Command: RequestOwnLocation
- * @param blindNode IEEE_ADDRESS
- */
-#define emberAfFillCommandRSSI                                                                                                     \
-    LocationClusterRequestOwnLocation(blindNode) emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, "u", blindNode);
+ * @param blindNode IEEE_ADDRESS 
+ */
+#define emberAfFillCommandRSSI LocationClusterRequestOwnLocation( \
+  blindNode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_OWN_LOCATION_COMMAND_ID, \
+    "u", \
+    blindNode \
+  );
 
 /** @brief Command description for RestartDevice
  *
  * Command: RestartDevice
- * @param options RestartOptions
- * @param status ENUM8
- * @param delay INT8U
- * @param jitter INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestartDevice(options, status, delay, jitter)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTART_DEVICE_COMMAND_ID, "uuuu", options, status, delay, jitter);
+ * @param options RestartOptions 
+ * @param status ENUM8 
+ * @param delay INT8U 
+ * @param jitter INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestartDevice( \
+  options, \
+  status, \
+  delay, \
+  jitter \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTART_DEVICE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    status, \
+    delay, \
+    jitter \
+  );
 
 /** @brief Command description for SaveStartupParameters
  *
  * Command: SaveStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterSaveStartupParameters(options, status, index)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterSaveStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SAVE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for RestoreStartupParameters
  *
  * Command: RestoreStartupParameters
- * @param options BITMAP8
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterRestoreStartupParameters(options, status, index)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options BITMAP8 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterRestoreStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESTORE_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for ResetStartupParameters
  *
  * Command: ResetStartupParameters
- * @param options ResetOptions
- * @param status ENUM8
- * @param index INT8U
- */
-#define emberAfFillCommandCommissioningClusterResetStartupParameters(options, status, index)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, "uuu", options, status, index);
+ * @param options ResetOptions 
+ * @param status ENUM8 
+ * @param index INT8U 
+ */
+#define emberAfFillCommandCommissioningClusterResetStartupParameters( \
+  options, \
+  status, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_STARTUP_PARAMETERS_COMMAND_ID, \
+    "uuu", \
+    options, \
+    status, \
+    index \
+  );
 
 /** @brief Command description for TransferPartitionedFrame
  *
  * Command: TransferPartitionedFrame
- * @param fragmentationOptions BITMAP8
- * @param ackOptions BITMAP8
+ * @param fragmentationOptions BITMAP8 
+ * @param ackOptions BITMAP8 
  * @param partitionedIndicatorAndFrame INT8U []
  * @param partitionedIndicatorAndFrameLen int
  * @param firstFrameIdAndNackList INT8U []
  * @param firstFrameIdAndNackListLen int
  */
-#define emberAfFillCommandPartitionClusterTransferPartitionedFrame(fragmentationOptions, ackOptions, partitionedIndicatorAndFrame, \
-                                                                   partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,       \
-                                                                   firstFrameIdAndNackListLen)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, "uubb", fragmentationOptions, ackOptions,                 \
-                              partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, firstFrameIdAndNackList,              \
-                              firstFrameIdAndNackListLen);
+#define emberAfFillCommandPartitionClusterTransferPartitionedFrame( \
+  fragmentationOptions, \
+  ackOptions, \
+  partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+  firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_PARTITIONED_FRAME_COMMAND_ID, \
+    "uubb", \
+    fragmentationOptions, \
+    ackOptions, \
+    partitionedIndicatorAndFrame, partitionedIndicatorAndFrameLen, \
+    firstFrameIdAndNackList, firstFrameIdAndNackListLen \
+  );
 
 /** @brief Command description for ReadHandshakeParam
  *
  * Command: ReadHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
+ * @param partitionedClusterId CLUSTER_ID 
  * @param attributeList ATTRIBUTE_ID []
  * @param attributeListLen int
  * @param readAttributeStatusRecords ReadAttributeStatusRecord []
  * @param readAttributeStatusRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterReadHandshakeParam(partitionedClusterId, partitionedClusterId, attributeList,            \
-                                                             attributeListLen, readAttributeStatusRecords,                         \
-                                                             readAttributeStatusRecordsLen)                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, "uubb", partitionedClusterId, partitionedClusterId,             \
-                              attributeList, attributeListLen, readAttributeStatusRecords, readAttributeStatusRecordsLen);
+#define emberAfFillCommandPartitionClusterReadHandshakeParam( \
+  partitionedClusterId, \
+  partitionedClusterId, \
+  attributeList, attributeListLen, \
+  readAttributeStatusRecords, readAttributeStatusRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_HANDSHAKE_PARAM_COMMAND_ID, \
+    "uubb", \
+    partitionedClusterId, \
+    partitionedClusterId, \
+    attributeList, attributeListLen, \
+    readAttributeStatusRecords, readAttributeStatusRecordsLen \
+  );
 
 /** @brief Command description for WriteHandshakeParam
  *
  * Command: WriteHandshakeParam
- * @param partitionedClusterId CLUSTER_ID
+ * @param partitionedClusterId CLUSTER_ID 
  * @param writeAttributeRecords WriteAttributeRecord []
  * @param writeAttributeRecordsLen int
  */
-#define emberAfFillCommandPartitionClusterWriteHandshakeParam(partitionedClusterId, writeAttributeRecords,                         \
-                                                              writeAttributeRecordsLen)                                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, "ub", partitionedClusterId, writeAttributeRecords,             \
-                              writeAttributeRecordsLen);
+#define emberAfFillCommandPartitionClusterWriteHandshakeParam( \
+  partitionedClusterId, \
+  writeAttributeRecords, writeAttributeRecordsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_HANDSHAKE_PARAM_COMMAND_ID, \
+    "ub", \
+    partitionedClusterId, \
+    writeAttributeRecords, writeAttributeRecordsLen \
+  );
 
 /** @brief Command description for ImageNotify
  *
  * Command: ImageNotify
- * @param payloadType ENUM8
- * @param queryJitter INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param newFileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageNotify(payloadType, queryJitter, manufacturerId, imageType, newFileVersion)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_NOTIFY_COMMAND_ID, "uuuuu", payloadType, queryJitter, manufacturerId, imageType,       \
-                                  newFileVersion);
+ * @param payloadType ENUM8 
+ * @param queryJitter INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param newFileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageNotify( \
+  payloadType, \
+  queryJitter, \
+  manufacturerId, \
+  imageType, \
+  newFileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_NOTIFY_COMMAND_ID, \
+    "uuuuu", \
+    payloadType, \
+    queryJitter, \
+    manufacturerId, \
+    imageType, \
+    newFileVersion \
+  );
 
 /** @brief Command description for QueryNextImageRequest
  *
  * Command: QueryNextImageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param currentFileVersion INT32U
- * @param hardwareVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageRequest(fieldControl, manufacturerId, imageType, currentFileVersion, hardwareVersion)  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, "uuuuu", fieldControl, manufacturerId, imageType,       \
-                                  currentFileVersion, hardwareVersion);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param currentFileVersion INT32U 
+ * @param hardwareVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  currentFileVersion, \
+  hardwareVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    currentFileVersion, \
+    hardwareVersion \
+  );
 
 /** @brief Command description for QueryNextImageResponse
  *
  * Command: QueryNextImageResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQueryNextImageResponse(status, manufacturerId, imageType, fileVersion, imageSize)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,            \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQueryNextImageResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_NEXT_IMAGE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for ImageBlockRequest
  *
  * Command: ImageBlockRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,     \
-                                                requestNodeAddress)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, "uuuuuuu", fieldControl, manufacturerId, imageType,          \
-                                  fileVersion, fileOffset, maxDataSize, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_REQUEST_COMMAND_ID, \
+    "uuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImagePageRequest
  *
  * Command: ImagePageRequest
- * @param fieldControl INT8U
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param maxDataSize INT8U
- * @param pageSize INT16U
- * @param responseSpacing INT16U
- * @param requestNodeAddress IEEE_ADDRESS
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImagePageRequest(fieldControl, manufacturerId, imageType, fileVersion, fileOffset, maxDataSize,      \
-                                               pageSize, responseSpacing, requestNodeAddress)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, "uuuuuuuuu", fieldControl, manufacturerId, imageType,         \
-                                  fileVersion, fileOffset, maxDataSize, pageSize, responseSpacing, requestNodeAddress);
+ * @param fieldControl INT8U 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param maxDataSize INT8U 
+ * @param pageSize INT16U 
+ * @param responseSpacing INT16U 
+ * @param requestNodeAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterImagePageRequest( \
+  fieldControl, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  maxDataSize, \
+  pageSize, \
+  responseSpacing, \
+  requestNodeAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_PAGE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuu", \
+    fieldControl, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    maxDataSize, \
+    pageSize, \
+    responseSpacing, \
+    requestNodeAddress \
+  );
 
 /** @brief Command description for ImageBlockResponse
  *
  * Command: ImageBlockResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param fileOffset INT32U
- * @param dataSize INT8U
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param fileOffset INT32U 
+ * @param dataSize INT8U 
  * @param imageData INT8U []
  * @param imageDataLen int
  */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterImageBlockResponse(status, manufacturerId, imageType, fileVersion, fileOffset, dataSize, imageData,  \
-                                                 imageDataLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, "uuuuuub", status, manufacturerId, imageType, fileVersion,  \
-                                  fileOffset, dataSize, imageData, imageDataLen);
+#define emberAfFillCommandOver the Air BootloadingClusterImageBlockResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  fileOffset, \
+  dataSize, \
+  imageData, imageDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IMAGE_BLOCK_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    fileOffset, \
+    dataSize, \
+    imageData, imageDataLen \
+  );
 
 /** @brief Command description for UpgradeEndRequest
  *
  * Command: UpgradeEndRequest
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndRequest(status, manufacturerId, imageType, fileVersion)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_REQUEST_COMMAND_ID, "uuuu", status, manufacturerId, imageType, fileVersion);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndRequest( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion \
+  );
 
 /** @brief Command description for UpgradeEndResponse
  *
  * Command: UpgradeEndResponse
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentTime UTC_TIME
- * @param upgradeTime UTC_TIME
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterUpgradeEndResponse(manufacturerId, imageType, fileVersion, currentTime, upgradeTime)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, "uuuuu", manufacturerId, imageType, fileVersion,            \
-                                  currentTime, upgradeTime);
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentTime UTC_TIME 
+ * @param upgradeTime UTC_TIME 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterUpgradeEndResponse( \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentTime, \
+  upgradeTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPGRADE_END_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentTime, \
+    upgradeTime \
+  );
 
 /** @brief Command description for QuerySpecificFileRequest
  *
  * Command: QuerySpecificFileRequest
- * @param requestNodeAddress IEEE_ADDRESS
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param currentZigbeeStackVersion INT16U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileRequest(requestNodeAddress, manufacturerId, imageType, fileVersion,                 \
-                                                       currentZigbeeStackVersion)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, "uuuuu", requestNodeAddress, manufacturerId,         \
-                                  imageType, fileVersion, currentZigbeeStackVersion);
+ * @param requestNodeAddress IEEE_ADDRESS 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param currentZigbeeStackVersion INT16U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileRequest( \
+  requestNodeAddress, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  currentZigbeeStackVersion \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    requestNodeAddress, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    currentZigbeeStackVersion \
+  );
 
 /** @brief Command description for QuerySpecificFileResponse
  *
  * Command: QuerySpecificFileResponse
- * @param status Status
- * @param manufacturerId INT16U
- * @param imageType INT16U
- * @param fileVersion INT32U
- * @param imageSize INT32U
- */
-#define emberAfFillCommandOver                                                                                                     \
-    the Air BootloadingClusterQuerySpecificFileResponse(status, manufacturerId, imageType, fileVersion, imageSize)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, "uuuuu", status, manufacturerId, imageType,         \
-                                  fileVersion, imageSize);
+ * @param status Status 
+ * @param manufacturerId INT16U 
+ * @param imageType INT16U 
+ * @param fileVersion INT32U 
+ * @param imageSize INT32U 
+ */
+#define emberAfFillCommandOver the Air BootloadingClusterQuerySpecificFileResponse( \
+  status, \
+  manufacturerId, \
+  imageType, \
+  fileVersion, \
+  imageSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUERY_SPECIFIC_FILE_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    status, \
+    manufacturerId, \
+    imageType, \
+    fileVersion, \
+    imageSize \
+  );
 
 /** @brief Command description for PowerProfileRequest
  *
  * Command: PowerProfileRequest
- * @param powerProfileId INT8U
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileRequest(powerProfileId, totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,  \
-                                      transferredPhasesLen)                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, "uuuub", powerProfileId, totalProfileNum, powerProfileId,  \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileRequest( \
+  powerProfileId, \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    powerProfileId, \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileStateRequest
  *
  * Command: PowerProfileStateRequest
- * @param totalProfileNum INT8U
- * @param powerProfileId INT8U
- * @param numOfTransferredPhases INT8U
+ * @param totalProfileNum INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfTransferredPhases INT8U 
  * @param transferredPhases TransferredPhase []
  * @param transferredPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileStateRequest(totalProfileNum, powerProfileId, numOfTransferredPhases, transferredPhases,             \
-                                           transferredPhasesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, "uuub", totalProfileNum, powerProfileId,             \
-                                  numOfTransferredPhases, transferredPhases, transferredPhasesLen);
+#define emberAfFillCommandPower ProfileClusterPowerProfileStateRequest( \
+  totalProfileNum, \
+  powerProfileId, \
+  numOfTransferredPhases, \
+  transferredPhases, transferredPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    totalProfileNum, \
+    powerProfileId, \
+    numOfTransferredPhases, \
+    transferredPhases, transferredPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceResponse
  *
  * Command: GetPowerProfilePriceResponse
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param currency INT16U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param currency INT16U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceResponse(powerProfileId, powerProfileCount, currency, powerProfileRecords,                   \
-                                               powerProfileRecordsLen, price, priceTrailingDigit)                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, "uuubuu", powerProfileId, powerProfileCount,    \
-                                  currency, powerProfileRecords, powerProfileRecordsLen, price, priceTrailingDigit);
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceResponse( \
+  powerProfileId, \
+  powerProfileCount, \
+  currency, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuubuu", \
+    powerProfileId, \
+    powerProfileCount, \
+    currency, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for GetOverallSchedulePriceResponse
  *
  * Command: GetOverallSchedulePriceResponse
- * @param currency INT16U
- * @param powerProfileId INT8U
- * @param price INT32U
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePriceResponse(currency, powerProfileId, price, priceTrailingDigit) emberAfFillExternalBuffer(  \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, "uuuu", currency, powerProfileId, price, priceTrailingDigit);
+ * @param currency INT16U 
+ * @param powerProfileId INT8U 
+ * @param price INT32U 
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePriceResponse( \
+  currency, \
+  powerProfileId, \
+  price, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    currency, \
+    powerProfileId, \
+    price, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleNotification
  *
  * Command: EnergyPhasesScheduleNotification
- * @param powerProfileId INT8U
- * @param powerProfileCount INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileCount INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param powerProfileRecords PowerProfileRecord []
  * @param powerProfileRecordsLen int
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleNotification(powerProfileId, powerProfileCount, numOfScheduledPhases, powerProfileRecords,   \
-                                                   powerProfileRecordsLen, scheduledPhases, scheduledPhasesLen)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, "uuubb", powerProfileId, powerProfileCount,  \
-                                  numOfScheduledPhases, powerProfileRecords, powerProfileRecordsLen, scheduledPhases,              \
-                                  scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleNotification( \
+  powerProfileId, \
+  powerProfileCount, \
+  numOfScheduledPhases, \
+  powerProfileRecords, powerProfileRecordsLen, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_NOTIFICATION_COMMAND_ID, \
+    "uuubb", \
+    powerProfileId, \
+    powerProfileCount, \
+    numOfScheduledPhases, \
+    powerProfileRecords, powerProfileRecordsLen, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetOverallSchedulePrice
  *
  * Command: GetOverallSchedulePrice
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetOverallSchedulePrice(powerProfileId, numOfScheduledPhases, scheduledPhases, scheduledPhasesLen)               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, "uub", powerProfileId, numOfScheduledPhases,          \
-                                  scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterGetOverallSchedulePrice( \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_OVERALL_SCHEDULE_PRICE_COMMAND_ID, \
+    "uub", \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsRequest
  *
  * Command: PowerProfileScheduleConstraintsRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsRequest(powerProfileId, powerProfileId) emberAfFillExternalBuffer(                \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, "uu", powerProfileId, powerProfileId);
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsRequest( \
+  powerProfileId, \
+  powerProfileId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_REQUEST_COMMAND_ID, \
+    "uu", \
+    powerProfileId, \
+    powerProfileId \
+  );
 
 /** @brief Command description for EnergyPhasesScheduleStateRequest
  *
  * Command: EnergyPhasesScheduleStateRequest
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param numOfScheduledPhases INT8U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param numOfScheduledPhases INT8U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
  */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterEnergyPhasesScheduleStateRequest(powerProfileId, powerProfileId, numOfScheduledPhases, scheduledPhases,          \
-                                                   scheduledPhasesLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, "uuub", powerProfileId, powerProfileId,     \
-                                  numOfScheduledPhases, scheduledPhases, scheduledPhasesLen);
+#define emberAfFillCommandPower ProfileClusterEnergyPhasesScheduleStateRequest( \
+  powerProfileId, \
+  powerProfileId, \
+  numOfScheduledPhases, \
+  scheduledPhases, scheduledPhasesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENERGY_PHASES_SCHEDULE_STATE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    powerProfileId, \
+    powerProfileId, \
+    numOfScheduledPhases, \
+    scheduledPhases, scheduledPhasesLen \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtendedResponse
  *
  * Command: GetPowerProfilePriceExtendedResponse
- * @param powerProfileId INT8U
- * @param powerProfileId INT8U
- * @param currency INT16U
- * @param numOfScheduledPhases INT8U
- * @param price INT32U
+ * @param powerProfileId INT8U 
+ * @param powerProfileId INT8U 
+ * @param currency INT16U 
+ * @param numOfScheduledPhases INT8U 
+ * @param price INT32U 
  * @param scheduledPhases ScheduledPhase []
  * @param scheduledPhasesLen int
- * @param priceTrailingDigit INT8U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtendedResponse(powerProfileId, powerProfileId, currency, numOfScheduledPhases, price,      \
-                                                       scheduledPhases, scheduledPhasesLen, priceTrailingDigit)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, "uuuuubu", powerProfileId,             \
-                                  powerProfileId, currency, numOfScheduledPhases, price, scheduledPhases, scheduledPhasesLen,      \
-                                  priceTrailingDigit);
+ * @param priceTrailingDigit INT8U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtendedResponse( \
+  powerProfileId, \
+  powerProfileId, \
+  currency, \
+  numOfScheduledPhases, \
+  price, \
+  scheduledPhases, scheduledPhasesLen, \
+  priceTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_RESPONSE_COMMAND_ID, \
+    "uuuuubu", \
+    powerProfileId, \
+    powerProfileId, \
+    currency, \
+    numOfScheduledPhases, \
+    price, \
+    scheduledPhases, scheduledPhasesLen, \
+    priceTrailingDigit \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsNotification
  *
  * Command: PowerProfileScheduleConstraintsNotification
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsNotification(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsNotification( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for PowerProfileScheduleConstraintsResponse
  *
  * Command: PowerProfileScheduleConstraintsResponse
- * @param powerProfileId INT8U
- * @param startAfter INT16U
- * @param stopBefore INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterPowerProfileScheduleConstraintsResponse(powerProfileId, startAfter, stopBefore) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, "uuu", powerProfileId, startAfter, stopBefore);
+ * @param powerProfileId INT8U 
+ * @param startAfter INT16U 
+ * @param stopBefore INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterPowerProfileScheduleConstraintsResponse( \
+  powerProfileId, \
+  startAfter, \
+  stopBefore \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_POWER_PROFILE_SCHEDULE_CONSTRAINTS_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    powerProfileId, \
+    startAfter, \
+    stopBefore \
+  );
 
 /** @brief Command description for GetPowerProfilePriceExtended
  *
  * Command: GetPowerProfilePriceExtended
- * @param options BITMAP8
- * @param powerProfileId INT8U
- * @param powerProfileStartTime INT16U
- */
-#define emberAfFillCommandPower                                                                                                    \
-    ProfileClusterGetPowerProfilePriceExtended(options, powerProfileId, powerProfileStartTime) emberAfFillExternalBuffer(          \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, "uuu", options, powerProfileId, powerProfileStartTime);
+ * @param options BITMAP8 
+ * @param powerProfileId INT8U 
+ * @param powerProfileStartTime INT16U 
+ */
+#define emberAfFillCommandPower ProfileClusterGetPowerProfilePriceExtended( \
+  options, \
+  powerProfileId, \
+  powerProfileStartTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_POWER_PROFILE_PRICE_EXTENDED_COMMAND_ID, \
+    "uuu", \
+    options, \
+    powerProfileId, \
+    powerProfileStartTime \
+  );
 
 /** @brief Command description for ExecutionOfACommand
  *
  * Command: ExecutionOfACommand
- * @param commandId CommandIdentification
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterExecutionOfACommand(commandId, applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2)             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, "uuuu", commandId, applianceStatus,                       \
-                                  remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param commandId CommandIdentification 
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterExecutionOfACommand( \
+  commandId, \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXECUTION_OF_A_COMMAND_COMMAND_ID, \
+    "uuuu", \
+    commandId, \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for SignalState
  *
  * Command: SignalState
- * @param applianceStatus ApplianceStatus
- * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2
- * @param applianceStatus2 INT24U
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterSignalState(applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SIGNAL_STATE_COMMAND_ID, "uuu", applianceStatus, remoteEnableFlagsAndDeviceStatus2, applianceStatus2);
+ * @param applianceStatus ApplianceStatus 
+ * @param remoteEnableFlagsAndDeviceStatus2 RemoteEnableFlagsAndDeviceStatus2 
+ * @param applianceStatus2 INT24U 
+ */
+#define emberAfFillCommandAppliance ControlClusterSignalState( \
+  applianceStatus, \
+  remoteEnableFlagsAndDeviceStatus2, \
+  applianceStatus2 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SIGNAL_STATE_COMMAND_ID, \
+    "uuu", \
+    applianceStatus, \
+    remoteEnableFlagsAndDeviceStatus2, \
+    applianceStatus2 \
+  );
 
 /** @brief Command description for WriteFunctions
  *
  * Command: WriteFunctions
- * @param functionId INT16U
- * @param functionDataType ENUM8
+ * @param functionId INT16U 
+ * @param functionDataType ENUM8 
  * @param functionData INT8U []
  * @param functionDataLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterWriteFunctions(functionId, functionDataType, functionData, functionDataLen) emberAfFillExternalBuffer(           \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_WRITE_FUNCTIONS_COMMAND_ID, "uub", functionId, functionDataType, functionData, functionDataLen);
+#define emberAfFillCommandAppliance ControlClusterWriteFunctions( \
+  functionId, \
+  functionDataType, \
+  functionData, functionDataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FUNCTIONS_COMMAND_ID, \
+    "uub", \
+    functionId, \
+    functionDataType, \
+    functionData, functionDataLen \
+  );
 
 /** @brief Command description for OverloadPauseResume
  *
  * Command: OverloadPauseResume
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPauseResume() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPauseResume( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_RESUME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadPause
  *
  * Command: OverloadPause
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadPause() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_OVERLOAD_PAUSE_COMMAND_ID, "", );
+#define emberAfFillCommandAppliance ControlClusterOverloadPause( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_PAUSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for OverloadWarning
  *
  * Command: OverloadWarning
- * @param warningEvent WarningEvent
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    ControlClusterOverloadWarning(warningEvent) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_OVERLOAD_WARNING_COMMAND_ID, "u", warningEvent);
+ * @param warningEvent WarningEvent 
+ */
+#define emberAfFillCommandAppliance ControlClusterOverloadWarning( \
+  warningEvent \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OVERLOAD_WARNING_COMMAND_ID, \
+    "u", \
+    warningEvent \
+  );
 
 /** @brief Command description for CheckIn
  *
  * Command: CheckIn
- * @param startFastPolling BOOLEAN
- * @param fastPollTimeout INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterCheckIn(startFastPolling, fastPollTimeout)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHECK_IN_COMMAND_ID, "uu", startFastPolling, fastPollTimeout);
+ * @param startFastPolling BOOLEAN 
+ * @param fastPollTimeout INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterCheckIn( \
+  startFastPolling, \
+  fastPollTimeout \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHECK_IN_COMMAND_ID, \
+    "uu", \
+    startFastPolling, \
+    fastPollTimeout \
+  );
 
 /** @brief Command description for FastPollStop
  *
  * Command: FastPollStop
  */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterFastPollStop() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_FAST_POLL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandPoll ControlClusterFastPollStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_POLL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetLongPollInterval
  *
  * Command: SetLongPollInterval
- * @param newLongPollInterval INT32U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetLongPollInterval(newLongPollInterval)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, "u", newLongPollInterval);
+ * @param newLongPollInterval INT32U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetLongPollInterval( \
+  newLongPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LONG_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newLongPollInterval \
+  );
 
 /** @brief Command description for SetShortPollInterval
  *
  * Command: SetShortPollInterval
- * @param newShortPollInterval INT16U
- */
-#define emberAfFillCommandPoll                                                                                                     \
-    ControlClusterSetShortPollInterval(newShortPollInterval)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, "u", newShortPollInterval);
+ * @param newShortPollInterval INT16U 
+ */
+#define emberAfFillCommandPoll ControlClusterSetShortPollInterval( \
+  newShortPollInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_SHORT_POLL_INTERVAL_COMMAND_ID, \
+    "u", \
+    newShortPollInterval \
+  );
 
 /** @brief Command description for GpNotification
  *
  * Command: GpNotification
- * @param options GpNotificationOption
- * @param options GpNotificationResponseOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdEndpoint INT8U
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppDistance INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpNotification(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, gpdEndpoint, endpoint,                      \
-                               gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, \
-                               gppDistance)                                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_NOTIFICATION_COMMAND_ID, "uuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId, gpdIeee, \
-                                  gpdIeee, gpdEndpoint, endpoint, gpdSecurityFrameCounter, gpdSecurityFrameCounter, gpdCommandId,  \
-                                  gpdCommandPayload, gppShortAddress, gppDistance);
+ * @param options GpNotificationOption 
+ * @param options GpNotificationResponseOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdEndpoint INT8U 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpNotification( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  gpdEndpoint, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    gpdEndpoint, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpPairingSearch
  *
  * Command: GpPairingSearch
- * @param options GpPairingSearchOption
- * @param options GpPairingOption
- * @param gpdSrcId INT32U
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param endpoint INT8U
- * @param sinkIeeeAddress IEEE_ADDRESS
- * @param sinkNwkAddress INT16U
- * @param sinkGroupId INT16U
- * @param deviceId GpDeviceId
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdKey SECURITY_KEY
- * @param assignedAlias INT16U
- * @param groupcastRadius INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingSearch(options, options, gpdSrcId, gpdSrcId, gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress,       \
-                                sinkNwkAddress, sinkGroupId, deviceId, gpdSecurityFrameCounter, gpdKey, assignedAlias,             \
-                                groupcastRadius)                                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_SEARCH_COMMAND_ID, "uuuuuuuuuuuuuuuu", options, options, gpdSrcId, gpdSrcId,      \
-                                  gpdIeee, gpdIeee, endpoint, endpoint, sinkIeeeAddress, sinkNwkAddress, sinkGroupId, deviceId,    \
-                                  gpdSecurityFrameCounter, gpdKey, assignedAlias, groupcastRadius);
+ * @param options GpPairingSearchOption 
+ * @param options GpPairingOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param endpoint INT8U 
+ * @param sinkIeeeAddress IEEE_ADDRESS 
+ * @param sinkNwkAddress INT16U 
+ * @param sinkGroupId INT16U 
+ * @param deviceId GpDeviceId 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdKey SECURITY_KEY 
+ * @param assignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpPairingSearch( \
+  options, \
+  options, \
+  gpdSrcId, \
+  gpdSrcId, \
+  gpdIeee, \
+  gpdIeee, \
+  endpoint, \
+  endpoint, \
+  sinkIeeeAddress, \
+  sinkNwkAddress, \
+  sinkGroupId, \
+  deviceId, \
+  gpdSecurityFrameCounter, \
+  gpdKey, \
+  assignedAlias, \
+  groupcastRadius \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_SEARCH_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuu", \
+    options, \
+    options, \
+    gpdSrcId, \
+    gpdSrcId, \
+    gpdIeee, \
+    gpdIeee, \
+    endpoint, \
+    endpoint, \
+    sinkIeeeAddress, \
+    sinkNwkAddress, \
+    sinkGroupId, \
+    deviceId, \
+    gpdSecurityFrameCounter, \
+    gpdKey, \
+    assignedAlias, \
+    groupcastRadius \
+  );
 
 /** @brief Command description for GpProxyCommissioningMode
  *
  * Command: GpProxyCommissioningMode
- * @param options GpProxyCommissioningModeOption
- * @param commissioningWindow INT16U
- * @param channel INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyCommissioningMode(options, commissioningWindow, channel)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, "uuu", options, commissioningWindow, channel);
+ * @param options GpProxyCommissioningModeOption 
+ * @param commissioningWindow INT16U 
+ * @param channel INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyCommissioningMode( \
+  options, \
+  commissioningWindow, \
+  channel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuu", \
+    options, \
+    commissioningWindow, \
+    channel \
+  );
 
 /** @brief Command description for GpTunnelingStop
  *
  * Command: GpTunnelingStop
- * @param options GpTunnelingStopOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gppShortAddress INT16U
- * @param gppDistance INT8S
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTunnelingStop(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gppShortAddress, gppDistance)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TUNNELING_STOP_COMMAND_ID, "uuuuuuu", options, gpdSrcId, gpdIeee, endpoint,               \
-                                  gpdSecurityFrameCounter, gppShortAddress, gppDistance);
+ * @param options GpTunnelingStopOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gppShortAddress INT16U 
+ * @param gppDistance INT8S 
+ */
+#define emberAfFillCommandGreen PowerClusterGpTunnelingStop( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gppShortAddress, \
+  gppDistance \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TUNNELING_STOP_COMMAND_ID, \
+    "uuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gppShortAddress, \
+    gppDistance \
+  );
 
 /** @brief Command description for GpCommissioningNotification
  *
  * Command: GpCommissioningNotification
- * @param options GpCommissioningNotificationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- * @param gppShortAddress INT16U
- * @param gppLink INT8U
- * @param mic INT32U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpCommissioningNotification(options, gpdSrcId, gpdIeee, endpoint, gpdSecurityFrameCounter, gpdCommandId,           \
-                                            gpdCommandPayload, gppShortAddress, gppLink, mic)                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, "uuuuuuuuuu", options, gpdSrcId, gpdIeee,          \
-                                  endpoint, gpdSecurityFrameCounter, gpdCommandId, gpdCommandPayload, gppShortAddress, gppLink,    \
-                                  mic);
+ * @param options GpCommissioningNotificationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ * @param gppShortAddress INT16U 
+ * @param gppLink INT8U 
+ * @param mic INT32U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpCommissioningNotification( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdSecurityFrameCounter, \
+  gpdCommandId, \
+  gpdCommandPayload, \
+  gppShortAddress, \
+  gppLink, \
+  mic \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_COMMISSIONING_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdSecurityFrameCounter, \
+    gpdCommandId, \
+    gpdCommandPayload, \
+    gppShortAddress, \
+    gppLink, \
+    mic \
+  );
 
 /** @brief Command description for GpSinkCommissioningMode
  *
  * Command: GpSinkCommissioningMode
- * @param options GpSinkCommissioningModeOptions
- * @param gpmAddrForSecurity INT16U
- * @param gpmAddrForPairing INT16U
- * @param sinkEndpoint INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkCommissioningMode(options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, "uuuu", options, gpmAddrForSecurity, gpmAddrForPairing, sinkEndpoint);
+ * @param options GpSinkCommissioningModeOptions 
+ * @param gpmAddrForSecurity INT16U 
+ * @param gpmAddrForPairing INT16U 
+ * @param sinkEndpoint INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpSinkCommissioningMode( \
+  options, \
+  gpmAddrForSecurity, \
+  gpmAddrForPairing, \
+  sinkEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_COMMISSIONING_MODE_COMMAND_ID, \
+    "uuuu", \
+    options, \
+    gpmAddrForSecurity, \
+    gpmAddrForPairing, \
+    sinkEndpoint \
+  );
 
 /** @brief Command description for GpResponse
  *
  * Command: GpResponse
- * @param options GpResponseOption
- * @param tempMasterShortAddress INT16U
- * @param tempMasterTxChannel BITMAP8
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param gpdCommandId INT8U
- * @param gpdCommandPayload OCTET_STRING
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpResponse(options, tempMasterShortAddress, tempMasterTxChannel, gpdSrcId, gpdIeee, endpoint, gpdCommandId,        \
-                           gpdCommandPayload)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_RESPONSE_COMMAND_ID, "uuuuuuuu", options, tempMasterShortAddress, tempMasterTxChannel,    \
-                                  gpdSrcId, gpdIeee, endpoint, gpdCommandId, gpdCommandPayload);
+ * @param options GpResponseOption 
+ * @param tempMasterShortAddress INT16U 
+ * @param tempMasterTxChannel BITMAP8 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param gpdCommandId INT8U 
+ * @param gpdCommandPayload OCTET_STRING 
+ */
+#define emberAfFillCommandGreen PowerClusterGpResponse( \
+  options, \
+  tempMasterShortAddress, \
+  tempMasterTxChannel, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  gpdCommandId, \
+  gpdCommandPayload \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_RESPONSE_COMMAND_ID, \
+    "uuuuuuuu", \
+    options, \
+    tempMasterShortAddress, \
+    tempMasterTxChannel, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    gpdCommandId, \
+    gpdCommandPayload \
+  );
 
 /** @brief Command description for GpTranslationTableUpdate
  *
  * Command: GpTranslationTableUpdate
- * @param options GpTranslationTableUpdateOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
+ * @param options GpTranslationTableUpdateOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
  * @param translations GpTranslationTableUpdateTranslation []
  * @param translationsLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableUpdate(options, gpdSrcId, gpdIeee, endpoint, translations, translationsLen)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, "uuuub", options, gpdSrcId, gpdIeee, endpoint,       \
-                                  translations, translationsLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableUpdate( \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  translations, translationsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_UPDATE_COMMAND_ID, \
+    "uuuub", \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    translations, translationsLen \
+  );
 
 /** @brief Command description for GpTranslationTableRequest
  *
  * Command: GpTranslationTableRequest
- * @param startIndex INT8U
- * @param status GpTranslationTableResponseStatus
- * @param options GpTranslationTableResponseOption
- * @param totalNumberOfEntries INT8U
- * @param startIndex INT8U
- * @param entriesCount INT8U
+ * @param startIndex INT8U 
+ * @param status GpTranslationTableResponseStatus 
+ * @param options GpTranslationTableResponseOption 
+ * @param totalNumberOfEntries INT8U 
+ * @param startIndex INT8U 
+ * @param entriesCount INT8U 
  * @param translationTableList INT8U []
  * @param translationTableListLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpTranslationTableRequest(startIndex, status, options, totalNumberOfEntries, startIndex, entriesCount,             \
-                                          translationTableList, translationTableListLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, "uuuuuub", startIndex, status, options,             \
-                                  totalNumberOfEntries, startIndex, entriesCount, translationTableList, translationTableListLen);
+#define emberAfFillCommandGreen PowerClusterGpTranslationTableRequest( \
+  startIndex, \
+  status, \
+  options, \
+  totalNumberOfEntries, \
+  startIndex, \
+  entriesCount, \
+  translationTableList, translationTableListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_TRANSLATION_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuub", \
+    startIndex, \
+    status, \
+    options, \
+    totalNumberOfEntries, \
+    startIndex, \
+    entriesCount, \
+    translationTableList, translationTableListLen \
+  );
 
 /** @brief Command description for GpPairingConfiguration
  *
  * Command: GpPairingConfiguration
- * @param actions GpPairingConfigurationActions
- * @param options GpPairingConfigurationOption
- * @param gpdSrcId INT32U
- * @param gpdIeee IEEE_ADDRESS
- * @param endpoint INT8U
- * @param deviceId INT8U
- * @param groupListCount INT8U
+ * @param actions GpPairingConfigurationActions 
+ * @param options GpPairingConfigurationOption 
+ * @param gpdSrcId INT32U 
+ * @param gpdIeee IEEE_ADDRESS 
+ * @param endpoint INT8U 
+ * @param deviceId INT8U 
+ * @param groupListCount INT8U 
  * @param groupList GpPairingConfigurationGroupList []
  * @param groupListLen int
- * @param gpdAssignedAlias INT16U
- * @param groupcastRadius INT8U
- * @param securityOptions INT8U
- * @param gpdSecurityFrameCounter INT32U
- * @param gpdSecurityKey SECURITY_KEY
- * @param numberOfPairedEndpoints INT8U
+ * @param gpdAssignedAlias INT16U 
+ * @param groupcastRadius INT8U 
+ * @param securityOptions INT8U 
+ * @param gpdSecurityFrameCounter INT32U 
+ * @param gpdSecurityKey SECURITY_KEY 
+ * @param numberOfPairedEndpoints INT8U 
  * @param pairedEndpoints INT8U []
  * @param pairedEndpointsLen int
- * @param applicationInformation GpApplicationInformation
- * @param manufacturerId INT16U
- * @param modeId INT16U
- * @param numberOfGpdCommands INT8U
+ * @param applicationInformation GpApplicationInformation 
+ * @param manufacturerId INT16U 
+ * @param modeId INT16U 
+ * @param numberOfGpdCommands INT8U 
  * @param gpdCommandIdList INT8U []
  * @param gpdCommandIdListLen int
- * @param clusterIdListCount INT8U
+ * @param clusterIdListCount INT8U 
  * @param clusterListServer INT16U []
  * @param clusterListServerLen int
  * @param clusterListClient INT16U []
  * @param clusterListClientLen int
- * @param switchInformationLength INT8U
- * @param switchConfiguration INT8U
- * @param currentContactStatus INT8U
- * @param totalNumberOfReports INT8U
- * @param numberOfReports INT8U
+ * @param switchInformationLength INT8U 
+ * @param switchConfiguration INT8U 
+ * @param currentContactStatus INT8U 
+ * @param totalNumberOfReports INT8U 
+ * @param numberOfReports INT8U 
  * @param reportDescriptor INT8U []
  * @param reportDescriptorLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpPairingConfiguration(                                                                                            \
-        actions, options, gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen, gpdAssignedAlias,        \
-        groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey, numberOfPairedEndpoints, pairedEndpoints,       \
-        pairedEndpointsLen, applicationInformation, manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList,                 \
-        gpdCommandIdListLen, clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient, clusterListClientLen, \
-        switchInformationLength, switchConfiguration, currentContactStatus, totalNumberOfReports, numberOfReports,                 \
-        reportDescriptor, reportDescriptorLen)                                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, "uuuuuuubuuuuuubuuuububbuuuuub", actions, options,      \
-                                  gpdSrcId, gpdIeee, endpoint, deviceId, groupListCount, groupList, groupListLen,                  \
-                                  gpdAssignedAlias, groupcastRadius, securityOptions, gpdSecurityFrameCounter, gpdSecurityKey,     \
-                                  numberOfPairedEndpoints, pairedEndpoints, pairedEndpointsLen, applicationInformation,            \
-                                  manufacturerId, modeId, numberOfGpdCommands, gpdCommandIdList, gpdCommandIdListLen,              \
-                                  clusterIdListCount, clusterListServer, clusterListServerLen, clusterListClient,                  \
-                                  clusterListClientLen, switchInformationLength, switchConfiguration, currentContactStatus,        \
-                                  totalNumberOfReports, numberOfReports, reportDescriptor, reportDescriptorLen);
+#define emberAfFillCommandGreen PowerClusterGpPairingConfiguration( \
+  actions, \
+  options, \
+  gpdSrcId, \
+  gpdIeee, \
+  endpoint, \
+  deviceId, \
+  groupListCount, \
+  groupList, groupListLen, \
+  gpdAssignedAlias, \
+  groupcastRadius, \
+  securityOptions, \
+  gpdSecurityFrameCounter, \
+  gpdSecurityKey, \
+  numberOfPairedEndpoints, \
+  pairedEndpoints, pairedEndpointsLen, \
+  applicationInformation, \
+  manufacturerId, \
+  modeId, \
+  numberOfGpdCommands, \
+  gpdCommandIdList, gpdCommandIdListLen, \
+  clusterIdListCount, \
+  clusterListServer, clusterListServerLen, \
+  clusterListClient, clusterListClientLen, \
+  switchInformationLength, \
+  switchConfiguration, \
+  currentContactStatus, \
+  totalNumberOfReports, \
+  numberOfReports, \
+  reportDescriptor, reportDescriptorLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PAIRING_CONFIGURATION_COMMAND_ID, \
+    "uuuuuuubuuuuuubuuuububbuuuuub", \
+    actions, \
+    options, \
+    gpdSrcId, \
+    gpdIeee, \
+    endpoint, \
+    deviceId, \
+    groupListCount, \
+    groupList, groupListLen, \
+    gpdAssignedAlias, \
+    groupcastRadius, \
+    securityOptions, \
+    gpdSecurityFrameCounter, \
+    gpdSecurityKey, \
+    numberOfPairedEndpoints, \
+    pairedEndpoints, pairedEndpointsLen, \
+    applicationInformation, \
+    manufacturerId, \
+    modeId, \
+    numberOfGpdCommands, \
+    gpdCommandIdList, gpdCommandIdListLen, \
+    clusterIdListCount, \
+    clusterListServer, clusterListServerLen, \
+    clusterListClient, clusterListClientLen, \
+    switchInformationLength, \
+    switchConfiguration, \
+    currentContactStatus, \
+    totalNumberOfReports, \
+    numberOfReports, \
+    reportDescriptor, reportDescriptorLen \
+  );
 
 /** @brief Command description for GpSinkTableRequest
  *
  * Command: GpSinkTableRequest
- * @param options GpSinkTableRequestOptions
- * @param status ENUM8
- * @param gpdSrcId INT32U
- * @param totalNumberofNonEmptySinkTableEntries INT8U
- * @param gpdIeee INT64U
- * @param startIndex INT8U
- * @param endpoint INT8U
- * @param sinkTableEntriesCount INT8U
- * @param index INT8U
+ * @param options GpSinkTableRequestOptions 
+ * @param status ENUM8 
+ * @param gpdSrcId INT32U 
+ * @param totalNumberofNonEmptySinkTableEntries INT8U 
+ * @param gpdIeee INT64U 
+ * @param startIndex INT8U 
+ * @param endpoint INT8U 
+ * @param sinkTableEntriesCount INT8U 
+ * @param index INT8U 
  * @param sinkTableEntries INT8U []
  * @param sinkTableEntriesLen int
  */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpSinkTableRequest(options, status, gpdSrcId, totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex,          \
-                                   endpoint, sinkTableEntriesCount, index, sinkTableEntries, sinkTableEntriesLen)                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, "uuuuuuuuub", options, status, gpdSrcId,                   \
-                                  totalNumberofNonEmptySinkTableEntries, gpdIeee, startIndex, endpoint, sinkTableEntriesCount,     \
-                                  index, sinkTableEntries, sinkTableEntriesLen);
+#define emberAfFillCommandGreen PowerClusterGpSinkTableRequest( \
+  options, \
+  status, \
+  gpdSrcId, \
+  totalNumberofNonEmptySinkTableEntries, \
+  gpdIeee, \
+  startIndex, \
+  endpoint, \
+  sinkTableEntriesCount, \
+  index, \
+  sinkTableEntries, sinkTableEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_SINK_TABLE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuub", \
+    options, \
+    status, \
+    gpdSrcId, \
+    totalNumberofNonEmptySinkTableEntries, \
+    gpdIeee, \
+    startIndex, \
+    endpoint, \
+    sinkTableEntriesCount, \
+    index, \
+    sinkTableEntries, sinkTableEntriesLen \
+  );
 
 /** @brief Command description for GpProxyTableResponse
  *
  * Command: GpProxyTableResponse
- * @param status GpProxyTableResponseStatus
- * @param options GpProxyTableRequestOptions
- * @param totalNumberOfNonEmptyProxyTableEntries INT8U
- * @param gpdSrcId INT32U
- * @param startIndex INT8U
- * @param gpdIeee INT64U
- * @param entriesCount INT8U
- * @param endpoint INT8U
+ * @param status GpProxyTableResponseStatus 
+ * @param options GpProxyTableRequestOptions 
+ * @param totalNumberOfNonEmptyProxyTableEntries INT8U 
+ * @param gpdSrcId INT32U 
+ * @param startIndex INT8U 
+ * @param gpdIeee INT64U 
+ * @param entriesCount INT8U 
+ * @param endpoint INT8U 
  * @param proxyTableEntries INT8U []
  * @param proxyTableEntriesLen int
- * @param index INT8U
- */
-#define emberAfFillCommandGreen                                                                                                    \
-    PowerClusterGpProxyTableResponse(status, options, totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee,       \
-                                     entriesCount, endpoint, proxyTableEntries, proxyTableEntriesLen, index)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, "uuuuuuuubu", status, options,                           \
-                                  totalNumberOfNonEmptyProxyTableEntries, gpdSrcId, startIndex, gpdIeee, entriesCount, endpoint,   \
-                                  proxyTableEntries, proxyTableEntriesLen, index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandGreen PowerClusterGpProxyTableResponse( \
+  status, \
+  options, \
+  totalNumberOfNonEmptyProxyTableEntries, \
+  gpdSrcId, \
+  startIndex, \
+  gpdIeee, \
+  entriesCount, \
+  endpoint, \
+  proxyTableEntries, proxyTableEntriesLen, \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID, \
+    "uuuuuuuubu", \
+    status, \
+    options, \
+    totalNumberOfNonEmptyProxyTableEntries, \
+    gpdSrcId, \
+    startIndex, \
+    gpdIeee, \
+    entriesCount, \
+    endpoint, \
+    proxyTableEntries, proxyTableEntriesLen, \
+    index \
+  );
 
 /** @brief Command description for StartUp
  *
  * Command: StartUp
  */
-#define emberAfFillCommandBasicClusterStartUp()                                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_UP_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterStartUp( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_UP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ShutDown
  *
  * Command: ShutDown
  */
-#define emberAfFillCommandBasicClusterShutDown()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SHUT_DOWN_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterShutDown( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHUT_DOWN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Leave
  *
  * Command: Leave
  */
-#define emberAfFillCommandBasicClusterLeave()                                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_COMMAND_ID, "", );
+#define emberAfFillCommandBasicClusterLeave( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetFabric
  *
  * Command: SetFabric
- * @param fabricId OCTET_STRING
- * @param fabricSecret OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabric(fabricId, fabricSecret, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_COMMAND_ID, "uuuu", fabricId, fabricSecret, breadcrumb, timeoutMs);
+ * @param fabricId OCTET_STRING 
+ * @param fabricSecret OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabric( \
+  fabricId, \
+  fabricSecret, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_COMMAND_ID, \
+    "uuuu", \
+    fabricId, \
+    fabricSecret, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetFabricResponse
  *
  * Command: SetFabricResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetFabricResponse(errorCode, debugText)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetFabricResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_FABRIC_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ArmFailSafe
  *
  * Command: ArmFailSafe
- * @param expiryLengthSeconds INT16U
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafe(expiryLengthSeconds, breadcrumb, timeoutMs)                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_COMMAND_ID, "uuu", expiryLengthSeconds, breadcrumb, timeoutMs);
+ * @param expiryLengthSeconds INT16U 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafe( \
+  expiryLengthSeconds, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_COMMAND_ID, \
+    "uuu", \
+    expiryLengthSeconds, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ArmFailSafeResponse
  *
  * Command: ArmFailSafeResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterArmFailSafeResponse(errorCode, debugText)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterArmFailSafeResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for SetRegulatoryConfig
  *
  * Command: SetRegulatoryConfig
- * @param location RegulatoryLocationType
- * @param countryCode CHAR_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfig(location, countryCode, breadcrumb, timeoutMs)                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, "uuuu", location, countryCode, breadcrumb, timeoutMs);
+ * @param location RegulatoryLocationType 
+ * @param countryCode CHAR_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfig( \
+  location, \
+  countryCode, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_COMMAND_ID, \
+    "uuuu", \
+    location, \
+    countryCode, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for SetRegulatoryConfigResponse
  *
  * Command: SetRegulatoryConfigResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterSetRegulatoryConfigResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterSetRegulatoryConfigResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for CommissioningComplete
  *
  * Command: CommissioningComplete
  */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningComplete() emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, "", );
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningComplete( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for CommissioningCompleteResponse
  *
  * Command: CommissioningCompleteResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandGeneral                                                                                                  \
-    CommissioningClusterCommissioningCompleteResponse(errorCode, debugText)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandGeneral CommissioningClusterCommissioningCompleteResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for ScanNetworks
  *
  * Command: ScanNetworks
- * @param ssid OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworks(ssid, breadcrumb, timeoutMs)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_COMMAND_ID, "uuu", ssid, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworks( \
+  ssid, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_COMMAND_ID, \
+    "uuu", \
+    ssid, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for ScanNetworksResponse
  *
  * Command: ScanNetworksResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
  * @param wifiScanResults WiFiInterfaceScanResult []
  * @param wifiScanResultsLen int
  * @param threadScanResults ThreadInterfaceScanResult []
  * @param threadScanResultsLen int
  */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterScanNetworksResponse(errorCode, debugText, wifiScanResults, wifiScanResultsLen, threadScanResults,         \
-                                             threadScanResultsLen)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, "uubb", errorCode, debugText, wifiScanResults,            \
-                                  wifiScanResultsLen, threadScanResults, threadScanResultsLen);
+#define emberAfFillCommandNetwork CommissioningClusterScanNetworksResponse( \
+  errorCode, \
+  debugText, \
+  wifiScanResults, wifiScanResultsLen, \
+  threadScanResults, threadScanResultsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID, \
+    "uubb", \
+    errorCode, \
+    debugText, \
+    wifiScanResults, wifiScanResultsLen, \
+    threadScanResults, threadScanResultsLen \
+  );
 
 /** @brief Command description for AddWiFiNetwork
  *
  * Command: AddWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddWiFiNetworkResponse
  *
  * Command: AddWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddWiFiNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateWiFiNetwork
  *
  * Command: UpdateWiFiNetwork
- * @param ssid OCTET_STRING
- * @param credentials OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetwork(ssid, credentials, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, "uuuu", ssid, credentials, breadcrumb, timeoutMs);
+ * @param ssid OCTET_STRING 
+ * @param credentials OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetwork( \
+  ssid, \
+  credentials, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_COMMAND_ID, \
+    "uuuu", \
+    ssid, \
+    credentials, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateWiFiNetworkResponse
  *
  * Command: UpdateWiFiNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateWiFiNetworkResponse(errorCode, debugText)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateWiFiNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_WI_FI_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for AddThreadNetwork
  *
  * Command: AddThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for AddThreadNetworkResponse
  *
  * Command: AddThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterAddThreadNetworkResponse(errorCode, debugText)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterAddThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADD_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for UpdateThreadNetwork
  *
  * Command: UpdateThreadNetwork
- * @param operationalDataset OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetwork(operationalDataset, breadcrumb, timeoutMs)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, "uuu", operationalDataset, breadcrumb, timeoutMs);
+ * @param operationalDataset OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetwork( \
+  operationalDataset, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_COMMAND_ID, \
+    "uuu", \
+    operationalDataset, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for UpdateThreadNetworkResponse
  *
  * Command: UpdateThreadNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterUpdateThreadNetworkResponse(errorCode, debugText)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterUpdateThreadNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_THREAD_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for RemoveNetwork
  *
  * Command: RemoveNetwork
- * @param NetworkID OCTET_STRING
- * @param Breadcrumb INT64U
- * @param TimeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetwork(NetworkID, Breadcrumb, TimeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_COMMAND_ID, "uuu", NetworkID, Breadcrumb, TimeoutMs);
+ * @param NetworkID OCTET_STRING 
+ * @param Breadcrumb INT64U 
+ * @param TimeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetwork( \
+  NetworkID, \
+  Breadcrumb, \
+  TimeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    NetworkID, \
+    Breadcrumb, \
+    TimeoutMs \
+  );
 
 /** @brief Command description for RemoveNetworkResponse
  *
  * Command: RemoveNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterRemoveNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterRemoveNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for EnableNetwork
  *
  * Command: EnableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetwork(networkID, breadcrumb, timeoutMs)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for EnableNetworkResponse
  *
  * Command: EnableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterEnableNetworkResponse(errorCode, debugText)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterEnableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for DisableNetwork
  *
  * Command: DisableNetwork
- * @param networkID OCTET_STRING
- * @param breadcrumb INT64U
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetwork(networkID, breadcrumb, timeoutMs)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_COMMAND_ID, "uuu", networkID, breadcrumb, timeoutMs);
+ * @param networkID OCTET_STRING 
+ * @param breadcrumb INT64U 
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetwork( \
+  networkID, \
+  breadcrumb, \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_COMMAND_ID, \
+    "uuu", \
+    networkID, \
+    breadcrumb, \
+    timeoutMs \
+  );
 
 /** @brief Command description for DisableNetworkResponse
  *
  * Command: DisableNetworkResponse
- * @param errorCode INT8U
- * @param debugText CHAR_STRING
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterDisableNetworkResponse(errorCode, debugText)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, "uu", errorCode, debugText);
+ * @param errorCode INT8U 
+ * @param debugText CHAR_STRING 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterDisableNetworkResponse( \
+  errorCode, \
+  debugText \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID, \
+    "uu", \
+    errorCode, \
+    debugText \
+  );
 
 /** @brief Command description for GetLastNetworkCommissioningResult
  *
  * Command: GetLastNetworkCommissioningResult
- * @param timeoutMs INT32U
- */
-#define emberAfFillCommandNetwork                                                                                                  \
-    CommissioningClusterGetLastNetworkCommissioningResult(timeoutMs)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, "u", timeoutMs);
+ * @param timeoutMs INT32U 
+ */
+#define emberAfFillCommandNetwork CommissioningClusterGetLastNetworkCommissioningResult( \
+  timeoutMs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID, \
+    "u", \
+    timeoutMs \
+  );
 
 /** @brief Command description for LockDoor
  *
  * Command: LockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterLockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_LOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterLockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for UnlockDoor
  *
  * Command: UnlockDoor
- * @param PIN CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockDoor(PIN, status) emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_UNLOCK_DOOR_COMMAND_ID, "uu", PIN, status);
+ * @param PIN CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockDoor( \
+  PIN, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_DOOR_COMMAND_ID, \
+    "uu", \
+    PIN, \
+    status \
+  );
 
 /** @brief Command description for Toggle
  *
  * Command: Toggle
- * @param pin CHAR_STRING
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterToggle(pin, status) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_TOGGLE_COMMAND_ID, "uu", pin, status);
+ * @param pin CHAR_STRING 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterToggle( \
+  pin, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TOGGLE_COMMAND_ID, \
+    "uu", \
+    pin, \
+    status \
+  );
 
 /** @brief Command description for UnlockWithTimeout
  *
  * Command: UnlockWithTimeout
- * @param timeoutInSeconds INT16U
- * @param status INT8U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterUnlockWithTimeout(timeoutInSeconds, status, pin)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, "uuu", timeoutInSeconds, status, pin);
+ * @param timeoutInSeconds INT16U 
+ * @param status INT8U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterUnlockWithTimeout( \
+  timeoutInSeconds, \
+  status, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID, \
+    "uuu", \
+    timeoutInSeconds, \
+    status, \
+    pin \
+  );
 
 /** @brief Command description for GetLogRecord
  *
  * Command: GetLogRecord
- * @param logIndex INT16U
- * @param logEntryId INT16U
- * @param timestamp INT32U
- * @param eventType ENUM8
- * @param source INT8U
- * @param eventIdOrAlarmCode INT8U
- * @param userId INT16U
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetLogRecord(logIndex, logEntryId, timestamp, eventType, source, eventIdOrAlarmCode, userId, pin)                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_LOG_RECORD_COMMAND_ID, "uuuuuuuu", logIndex, logEntryId, timestamp, eventType, source,   \
-                                  eventIdOrAlarmCode, userId, pin);
+ * @param logIndex INT16U 
+ * @param logEntryId INT16U 
+ * @param timestamp INT32U 
+ * @param eventType ENUM8 
+ * @param source INT8U 
+ * @param eventIdOrAlarmCode INT8U 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetLogRecord( \
+  logIndex, \
+  logEntryId, \
+  timestamp, \
+  eventType, \
+  source, \
+  eventIdOrAlarmCode, \
+  userId, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LOG_RECORD_COMMAND_ID, \
+    "uuuuuuuu", \
+    logIndex, \
+    logEntryId, \
+    timestamp, \
+    eventType, \
+    source, \
+    eventIdOrAlarmCode, \
+    userId, \
+    pin \
+  );
 
 /** @brief Command description for SetPin
  *
  * Command: SetPin
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetPin(userId, status, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PIN_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetPin( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for GetPin
  *
  * Command: GetPin
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param pin CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetPin(userId, userId, userStatus, userType, pin)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PIN_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, pin);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param pin CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetPin( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  pin \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PIN_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    pin \
+  );
 
 /** @brief Command description for ClearPin
  *
  * Command: ClearPin
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearPin(userId, status) emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_CLEAR_PIN_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearPin( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_PIN_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllPins
  *
  * Command: ClearAllPins
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllPins(status) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_CLEAR_ALL_PINS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllPins( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_PINS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for SetUserStatus
  *
  * Command: SetUserStatus
- * @param userId INT16U
- * @param status INT8U
- * @param userStatus INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserStatus(userId, status, userStatus)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_STATUS_COMMAND_ID, "uuu", userId, status, userStatus);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userStatus INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserStatus( \
+  userId, \
+  status, \
+  userStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userStatus \
+  );
 
 /** @brief Command description for GetUserStatus
  *
  * Command: GetUserStatus
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserStatus(userId, userId, status)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_STATUS_COMMAND_ID, "uuu", userId, userId, status);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserStatus( \
+  userId, \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_STATUS_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SetWeekdaySchedule
  *
  * Command: SetWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param daysMask DoorLockDayOfWeek
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetWeekdaySchedule(scheduleId, status, userId, daysMask, startHour, startMinute, endHour, endMinute)                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuu", scheduleId, status, userId, daysMask,           \
-                                  startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param daysMask DoorLockDayOfWeek 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterSetWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for GetWeekdaySchedule
  *
  * Command: GetWeekdaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param daysMask INT8U
- * @param startHour INT8U
- * @param startMinute INT8U
- * @param endHour INT8U
- * @param endMinute INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetWeekdaySchedule(scheduleId, scheduleId, userId, userId, status, daysMask, startHour, startMinute, endHour,       \
-                                  endMinute)                                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, "uuuuuuuuuu", scheduleId, scheduleId, userId, userId,       \
-                                  status, daysMask, startHour, startMinute, endHour, endMinute);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param daysMask INT8U 
+ * @param startHour INT8U 
+ * @param startMinute INT8U 
+ * @param endHour INT8U 
+ * @param endMinute INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterGetWeekdaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  daysMask, \
+  startHour, \
+  startMinute, \
+  endHour, \
+  endMinute \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    daysMask, \
+    startHour, \
+    startMinute, \
+    endHour, \
+    endMinute \
+  );
 
 /** @brief Command description for ClearWeekdaySchedule
  *
  * Command: ClearWeekdaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearWeekdaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearWeekdaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetYeardaySchedule
  *
  * Command: SetYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetYeardaySchedule(scheduleId, status, userId, localStartTime, localEndTime) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, userId, localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterSetYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    userId, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for GetYeardaySchedule
  *
  * Command: GetYeardaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param userId INT16U
- * @param userId INT16U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetYeardaySchedule(scheduleId, scheduleId, userId, userId, status, localStartTime, localEndTime)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, "uuuuuuu", scheduleId, scheduleId, userId, userId, status,  \
-                                  localStartTime, localEndTime);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ */
+#define emberAfFillCommandDoor LockClusterGetYeardaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  userId, \
+  userId, \
+  status, \
+  localStartTime, \
+  localEndTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    userId, \
+    userId, \
+    status, \
+    localStartTime, \
+    localEndTime \
+  );
 
 /** @brief Command description for ClearYeardaySchedule
  *
  * Command: ClearYeardaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param userId INT16U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearYeardaySchedule(scheduleId, status, userId)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, "uuu", scheduleId, status, userId);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param userId INT16U 
+ */
+#define emberAfFillCommandDoor LockClusterClearYeardaySchedule( \
+  scheduleId, \
+  status, \
+  userId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_YEARDAY_SCHEDULE_COMMAND_ID, \
+    "uuu", \
+    scheduleId, \
+    status, \
+    userId \
+  );
 
 /** @brief Command description for SetHolidaySchedule
  *
  * Command: SetHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetHolidaySchedule(scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuu", scheduleId, status, localStartTime, localEndTime,  \
-                                  operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterSetHolidaySchedule( \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuu", \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for GetHolidaySchedule
  *
  * Command: GetHolidaySchedule
- * @param scheduleId INT8U
- * @param scheduleId INT8U
- * @param status INT8U
- * @param localStartTime INT32U
- * @param localEndTime INT32U
- * @param operatingModeDuringHoliday ENUM8
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetHolidaySchedule(scheduleId, scheduleId, status, localStartTime, localEndTime, operatingModeDuringHoliday)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, "uuuuuu", scheduleId, scheduleId, status, localStartTime,   \
-                                  localEndTime, operatingModeDuringHoliday);
+ * @param scheduleId INT8U 
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ * @param localStartTime INT32U 
+ * @param localEndTime INT32U 
+ * @param operatingModeDuringHoliday ENUM8 
+ */
+#define emberAfFillCommandDoor LockClusterGetHolidaySchedule( \
+  scheduleId, \
+  scheduleId, \
+  status, \
+  localStartTime, \
+  localEndTime, \
+  operatingModeDuringHoliday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uuuuuu", \
+    scheduleId, \
+    scheduleId, \
+    status, \
+    localStartTime, \
+    localEndTime, \
+    operatingModeDuringHoliday \
+  );
 
 /** @brief Command description for ClearHolidaySchedule
  *
  * Command: ClearHolidaySchedule
- * @param scheduleId INT8U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearHolidaySchedule(scheduleId, status)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, "uu", scheduleId, status);
+ * @param scheduleId INT8U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearHolidaySchedule( \
+  scheduleId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    scheduleId, \
+    status \
+  );
 
 /** @brief Command description for SetUserType
  *
  * Command: SetUserType
- * @param userId INT16U
- * @param status INT8U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetUserType(userId, status, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_USER_TYPE_COMMAND_ID, "uuu", userId, status, userType);
+ * @param userId INT16U 
+ * @param status INT8U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterSetUserType( \
+  userId, \
+  status, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    status, \
+    userType \
+  );
 
 /** @brief Command description for GetUserType
  *
  * Command: GetUserType
- * @param userId INT16U
- * @param userId INT16U
- * @param userType DoorLockUserType
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetUserType(userId, userId, userType)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_USER_TYPE_COMMAND_ID, "uuu", userId, userId, userType);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userType DoorLockUserType 
+ */
+#define emberAfFillCommandDoor LockClusterGetUserType( \
+  userId, \
+  userId, \
+  userType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_USER_TYPE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    userId, \
+    userType \
+  );
 
 /** @brief Command description for SetRfid
  *
  * Command: SetRfid
- * @param userId INT16U
- * @param status DoorLockSetPinOrIdStatus
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param id CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterSetRfid(userId, status, userStatus, userType, id)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_RFID_COMMAND_ID, "uuuuu", userId, status, userStatus, userType, id);
+ * @param userId INT16U 
+ * @param status DoorLockSetPinOrIdStatus 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param id CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterSetRfid( \
+  userId, \
+  status, \
+  userStatus, \
+  userType, \
+  id \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    status, \
+    userStatus, \
+    userType, \
+    id \
+  );
 
 /** @brief Command description for GetRfid
  *
  * Command: GetRfid
- * @param userId INT16U
- * @param userId INT16U
- * @param userStatus DoorLockUserStatus
- * @param userType DoorLockUserType
- * @param rfid CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterGetRfid(userId, userId, userStatus, userType, rfid)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_RFID_COMMAND_ID, "uuuuu", userId, userId, userStatus, userType, rfid);
+ * @param userId INT16U 
+ * @param userId INT16U 
+ * @param userStatus DoorLockUserStatus 
+ * @param userType DoorLockUserType 
+ * @param rfid CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterGetRfid( \
+  userId, \
+  userId, \
+  userStatus, \
+  userType, \
+  rfid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RFID_COMMAND_ID, \
+    "uuuuu", \
+    userId, \
+    userId, \
+    userStatus, \
+    userType, \
+    rfid \
+  );
 
 /** @brief Command description for ClearRfid
  *
  * Command: ClearRfid
- * @param userId INT16U
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearRfid(userId, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_CLEAR_RFID_COMMAND_ID, "uu", userId, status);
+ * @param userId INT16U 
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearRfid( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_RFID_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for ClearAllRfids
  *
  * Command: ClearAllRfids
- * @param status INT8U
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterClearAllRfids(status) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, "u", status);
+ * @param status INT8U 
+ */
+#define emberAfFillCommandDoor LockClusterClearAllRfids( \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_ALL_RFIDS_COMMAND_ID, \
+    "u", \
+    status \
+  );
 
 /** @brief Command description for OperationEventNotification
  *
  * Command: OperationEventNotification
- * @param source INT8U
- * @param eventCode DoorLockOperationEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterOperationEventNotification(source, eventCode, userId, pin, timeStamp, data) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuu", source, eventCode, userId, pin, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockOperationEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterOperationEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_OPERATION_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for ProgrammingEventNotification
  *
  * Command: ProgrammingEventNotification
- * @param source INT8U
- * @param eventCode DoorLockProgrammingEventCode
- * @param userId INT16U
- * @param pin CHAR_STRING
- * @param userType DoorLockUserType
- * @param userStatus DoorLockUserStatus
- * @param timeStamp INT32U
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandDoor                                                                                                     \
-    LockClusterProgrammingEventNotification(source, eventCode, userId, pin, userType, userStatus, timeStamp, data)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, "uuuuuuuu", source, eventCode, userId, pin,       \
-                                  userType, userStatus, timeStamp, data);
+ * @param source INT8U 
+ * @param eventCode DoorLockProgrammingEventCode 
+ * @param userId INT16U 
+ * @param pin CHAR_STRING 
+ * @param userType DoorLockUserType 
+ * @param userStatus DoorLockUserStatus 
+ * @param timeStamp INT32U 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandDoor LockClusterProgrammingEventNotification( \
+  source, \
+  eventCode, \
+  userId, \
+  pin, \
+  userType, \
+  userStatus, \
+  timeStamp, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID, \
+    "uuuuuuuu", \
+    source, \
+    eventCode, \
+    userId, \
+    pin, \
+    userType, \
+    userStatus, \
+    timeStamp, \
+    data \
+  );
 
 /** @brief Command description for WindowCoveringUpOpen
  *
  * Command: WindowCoveringUpOpen
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringUpOpen() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringUpOpen( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_UP_OPEN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringDownClose
  *
  * Command: WindowCoveringDownClose
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringDownClose() emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringDownClose( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_DOWN_CLOSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringStop
  *
  * Command: WindowCoveringStop
  */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringStop() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_WINDOW_COVERING_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftValue
  *
  * Command: WindowCoveringGoToLiftValue
- * @param liftValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftValue(liftValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, "u", liftValue);
+ * @param liftValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftValue( \
+  liftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_VALUE_COMMAND_ID, \
+    "u", \
+    liftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToLiftPercentage
  *
  * Command: WindowCoveringGoToLiftPercentage
- * @param percentageLiftValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToLiftPercentage(percentageLiftValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, "u", percentageLiftValue);
+ * @param percentageLiftValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToLiftPercentage( \
+  percentageLiftValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_LIFT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageLiftValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltValue
  *
  * Command: WindowCoveringGoToTiltValue
- * @param tiltValue INT16U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltValue(tiltValue)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, "u", tiltValue);
+ * @param tiltValue INT16U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltValue( \
+  tiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_VALUE_COMMAND_ID, \
+    "u", \
+    tiltValue \
+  );
 
 /** @brief Command description for WindowCoveringGoToTiltPercentage
  *
  * Command: WindowCoveringGoToTiltPercentage
- * @param percentageTiltValue INT8U
- */
-#define emberAfFillCommandWindow                                                                                                   \
-    CoveringClusterWindowCoveringGoToTiltPercentage(percentageTiltValue)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, "u", percentageTiltValue);
+ * @param percentageTiltValue INT8U 
+ */
+#define emberAfFillCommandWindow CoveringClusterWindowCoveringGoToTiltPercentage( \
+  percentageTiltValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WINDOW_COVERING_GO_TO_TILT_PERCENTAGE_COMMAND_ID, \
+    "u", \
+    percentageTiltValue \
+  );
 
 /** @brief Command description for BarrierControlGoToPercent
  *
  * Command: BarrierControlGoToPercent
- * @param percentOpen INT8U
- */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlGoToPercent(percentOpen)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, "u", percentOpen);
+ * @param percentOpen INT8U 
+ */
+#define emberAfFillCommandBarrier ControlClusterBarrierControlGoToPercent( \
+  percentOpen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID, \
+    "u", \
+    percentOpen \
+  );
 
 /** @brief Command description for BarrierControlStop
  *
  * Command: BarrierControlStop
  */
-#define emberAfFillCommandBarrier                                                                                                  \
-    ControlClusterBarrierControlStop() emberAfFillExternalBuffer(mask,                                                             \
-                                                                                                                                   \
-                                                                 ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, "", );
+#define emberAfFillCommandBarrier ControlClusterBarrierControlStop( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BARRIER_CONTROL_STOP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetpointRaiseLower
  *
  * Command: SetpointRaiseLower
- * @param mode SetpointAdjustMode
- * @param numberOfTransitionsForSequence ENUM8
- * @param amount INT8S
- * @param dayOfWeekForSequence DayOfWeek
- * @param modeForSequence ModeForSequence
+ * @param mode SetpointAdjustMode 
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param amount INT8S 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param modeForSequence ModeForSequence 
  * @param payload INT8U []
  * @param payloadLen int
  */
-#define emberAfFillCommandThermostatClusterSetpointRaiseLower(mode, numberOfTransitionsForSequence, amount, dayOfWeekForSequence,  \
-                                                              modeForSequence, payload, payloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, "uuuuub", mode, numberOfTransitionsForSequence, amount,         \
-                              dayOfWeekForSequence, modeForSequence, payload, payloadLen);
+#define emberAfFillCommandThermostatClusterSetpointRaiseLower( \
+  mode, \
+  numberOfTransitionsForSequence, \
+  amount, \
+  dayOfWeekForSequence, \
+  modeForSequence, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID, \
+    "uuuuub", \
+    mode, \
+    numberOfTransitionsForSequence, \
+    amount, \
+    dayOfWeekForSequence, \
+    modeForSequence, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for SetWeeklySchedule
  *
  * Command: SetWeeklySchedule
- * @param numberOfTransitionsForSequence ENUM8
- * @param timeOfDay INT16U
- * @param dayOfWeekForSequence DayOfWeek
- * @param relayStatus BITMAP16
- * @param modeForSequence ModeForSequence
- * @param localTemperature INT16S
+ * @param numberOfTransitionsForSequence ENUM8 
+ * @param timeOfDay INT16U 
+ * @param dayOfWeekForSequence DayOfWeek 
+ * @param relayStatus BITMAP16 
+ * @param modeForSequence ModeForSequence 
+ * @param localTemperature INT16S 
  * @param payload INT8U []
  * @param payloadLen int
- * @param humidityInPercentage INT8U
- * @param setpoint INT16S
- * @param unreadEntries INT16U
- */
-#define emberAfFillCommandThermostatClusterSetWeeklySchedule(numberOfTransitionsForSequence, timeOfDay, dayOfWeekForSequence,      \
-                                                             relayStatus, modeForSequence, localTemperature, payload, payloadLen,  \
-                                                             humidityInPercentage, setpoint, unreadEntries)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, "uuuuuubuuu", numberOfTransitionsForSequence, timeOfDay,         \
-                              dayOfWeekForSequence, relayStatus, modeForSequence, localTemperature, payload, payloadLen,           \
-                              humidityInPercentage, setpoint, unreadEntries);
+ * @param humidityInPercentage INT8U 
+ * @param setpoint INT16S 
+ * @param unreadEntries INT16U 
+ */
+#define emberAfFillCommandThermostatClusterSetWeeklySchedule( \
+  numberOfTransitionsForSequence, \
+  timeOfDay, \
+  dayOfWeekForSequence, \
+  relayStatus, \
+  modeForSequence, \
+  localTemperature, \
+  payload, payloadLen, \
+  humidityInPercentage, \
+  setpoint, \
+  unreadEntries \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uuuuuubuuu", \
+    numberOfTransitionsForSequence, \
+    timeOfDay, \
+    dayOfWeekForSequence, \
+    relayStatus, \
+    modeForSequence, \
+    localTemperature, \
+    payload, payloadLen, \
+    humidityInPercentage, \
+    setpoint, \
+    unreadEntries \
+  );
 
 /** @brief Command description for GetWeeklySchedule
  *
  * Command: GetWeeklySchedule
- * @param daysToReturn DayOfWeek
- * @param modeToReturn ModeForSequence
- */
-#define emberAfFillCommandThermostatClusterGetWeeklySchedule(daysToReturn, modeToReturn)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, "uu", daysToReturn, modeToReturn);
+ * @param daysToReturn DayOfWeek 
+ * @param modeToReturn ModeForSequence 
+ */
+#define emberAfFillCommandThermostatClusterGetWeeklySchedule( \
+  daysToReturn, \
+  modeToReturn \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "uu", \
+    daysToReturn, \
+    modeToReturn \
+  );
 
 /** @brief Command description for ClearWeeklySchedule
  *
  * Command: ClearWeeklySchedule
  */
-#define emberAfFillCommandThermostatClusterClearWeeklySchedule()                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterClearWeeklySchedule( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetRelayStatusLog
  *
  * Command: GetRelayStatusLog
  */
-#define emberAfFillCommandThermostatClusterGetRelayStatusLog()                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, "", );
+#define emberAfFillCommandThermostatClusterGetRelayStatusLog( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for MoveToHue
  *
  * Command: MoveToHue
- * @param hue INT8U
- * @param direction HueDirection
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHue(hue, direction, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_COMMAND_ID, "uuuuu", hue, direction, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHue( \
+  hue, \
+  direction, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    direction, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveHue
  *
  * Command: MoveHue
- * @param moveMode HueMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveHue(moveMode, rate, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_HUE_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveHue( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_HUE_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepHue
  *
  * Command: StepHue
- * @param stepMode HueStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepHue(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_HUE_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_HUE_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToSaturation
  *
  * Command: MoveToSaturation
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToSaturation(saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_SATURATION_COMMAND_ID, "uuuu", saturation, transitionTime, optionsMask, optionsOverride);
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToSaturation( \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveSaturation
  *
  * Command: MoveSaturation
- * @param moveMode SaturationMoveMode
- * @param rate INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveSaturation(moveMode, rate, optionsMask, optionsOverride)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_SATURATION_COMMAND_ID, "uuuu", moveMode, rate, optionsMask, optionsOverride);
+ * @param moveMode SaturationMoveMode 
+ * @param rate INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveSaturation( \
+  moveMode, \
+  rate, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_SATURATION_COMMAND_ID, \
+    "uuuu", \
+    moveMode, \
+    rate, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepSaturation
  *
  * Command: StepSaturation
- * @param stepMode SaturationStepMode
- * @param stepSize INT8U
- * @param transitionTime INT8U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepSaturation(stepMode, stepSize, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(      \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_STEP_SATURATION_COMMAND_ID, "uuuuu", stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+ * @param stepMode SaturationStepMode 
+ * @param stepSize INT8U 
+ * @param transitionTime INT8U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepSaturation( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToHueAndSaturation
  *
  * Command: MoveToHueAndSaturation
- * @param hue INT8U
- * @param saturation INT8U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToHueAndSaturation(hue, saturation, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuuuu", hue, saturation, transitionTime, optionsMask, optionsOverride);
+ * @param hue INT8U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToHueAndSaturation( \
+  hue, \
+  saturation, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuuuu", \
+    hue, \
+    saturation, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColor
  *
  * Command: MoveToColor
- * @param colorX INT16U
- * @param colorY INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColor(colorX, colorY, transitionTime, optionsMask, optionsOverride) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MOVE_TO_COLOR_COMMAND_ID, "uuuuu", colorX, colorY, transitionTime, optionsMask, optionsOverride);
+ * @param colorX INT16U 
+ * @param colorY INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColor( \
+  colorX, \
+  colorY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    colorX, \
+    colorY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColor
  *
  * Command: MoveColor
- * @param rateX INT16S
- * @param rateY INT16S
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColor(rateX, rateY, optionsMask, optionsOverride)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_COMMAND_ID, "uuuu", rateX, rateY, optionsMask, optionsOverride);
+ * @param rateX INT16S 
+ * @param rateY INT16S 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColor( \
+  rateX, \
+  rateY, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_COMMAND_ID, \
+    "uuuu", \
+    rateX, \
+    rateY, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColor
  *
  * Command: StepColor
- * @param stepX INT16S
- * @param stepY INT16S
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColor(stepX, stepY, transitionTime, optionsMask, optionsOverride)                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_COMMAND_ID, "uuuuu", stepX, stepY, transitionTime, optionsMask, optionsOverride);
+ * @param stepX INT16S 
+ * @param stepY INT16S 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColor( \
+  stepX, \
+  stepY, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_COMMAND_ID, \
+    "uuuuu", \
+    stepX, \
+    stepY, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveToColorTemperature
  *
  * Command: MoveToColorTemperature
- * @param colorTemperature INT16U
- * @param transitionTime INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveToColorTemperature(colorTemperature, transitionTime, optionsMask, optionsOverride)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, "uuuu", colorTemperature, transitionTime, optionsMask, \
-                                  optionsOverride);
+ * @param colorTemperature INT16U 
+ * @param transitionTime INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveToColorTemperature( \
+  colorTemperature, \
+  transitionTime, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuu", \
+    colorTemperature, \
+    transitionTime, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for EnhancedMoveToHue
  *
  * Command: EnhancedMoveToHue
- * @param enhancedHue INT16U
- * @param direction HueDirection
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHue(enhancedHue, direction, transitionTime)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, "uuu", enhancedHue, direction, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param direction HueDirection 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHue( \
+  enhancedHue, \
+  direction, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    direction, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveHue
  *
  * Command: EnhancedMoveHue
- * @param moveMode HueMoveMode
- * @param rate INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveHue(moveMode, rate)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, "uu", moveMode, rate);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveHue( \
+  moveMode, \
+  rate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_HUE_COMMAND_ID, \
+    "uu", \
+    moveMode, \
+    rate \
+  );
 
 /** @brief Command description for EnhancedStepHue
  *
  * Command: EnhancedStepHue
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedStepHue(stepMode, stepSize, transitionTime)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENHANCED_STEP_HUE_COMMAND_ID, "uuu", stepMode, stepSize, transitionTime);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedStepHue( \
+  stepMode, \
+  stepSize, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_STEP_HUE_COMMAND_ID, \
+    "uuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime \
+  );
 
 /** @brief Command description for EnhancedMoveToHueAndSaturation
  *
  * Command: EnhancedMoveToHueAndSaturation
- * @param enhancedHue INT16U
- * @param saturation INT8U
- * @param transitionTime INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterEnhancedMoveToHueAndSaturation(enhancedHue, saturation, transitionTime) emberAfFillExternalBuffer(               \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, "uuu", enhancedHue, saturation, transitionTime);
+ * @param enhancedHue INT16U 
+ * @param saturation INT8U 
+ * @param transitionTime INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterEnhancedMoveToHueAndSaturation( \
+  enhancedHue, \
+  saturation, \
+  transitionTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID, \
+    "uuu", \
+    enhancedHue, \
+    saturation, \
+    transitionTime \
+  );
 
 /** @brief Command description for ColorLoopSet
  *
  * Command: ColorLoopSet
- * @param updateFlags ColorLoopUpdateFlags
- * @param action ColorLoopAction
- * @param direction ColorLoopDirection
- * @param time INT16U
- * @param startHue INT16U
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterColorLoopSet(updateFlags, action, direction, time, startHue)                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COLOR_LOOP_SET_COMMAND_ID, "uuuuu", updateFlags, action, direction, time, startHue);
+ * @param updateFlags ColorLoopUpdateFlags 
+ * @param action ColorLoopAction 
+ * @param direction ColorLoopDirection 
+ * @param time INT16U 
+ * @param startHue INT16U 
+ */
+#define emberAfFillCommandColor ControlClusterColorLoopSet( \
+  updateFlags, \
+  action, \
+  direction, \
+  time, \
+  startHue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COLOR_LOOP_SET_COMMAND_ID, \
+    "uuuuu", \
+    updateFlags, \
+    action, \
+    direction, \
+    time, \
+    startHue \
+  );
 
 /** @brief Command description for StopMoveStep
  *
  * Command: StopMoveStep
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStopMoveStep(optionsMask, optionsOverride)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STOP_MOVE_STEP_COMMAND_ID, "uu", optionsMask, optionsOverride);
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStopMoveStep( \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_MOVE_STEP_COMMAND_ID, \
+    "uu", \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for MoveColorTemperature
  *
  * Command: MoveColorTemperature
- * @param moveMode HueMoveMode
- * @param rate INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterMoveColorTemperature(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,              \
-                                       optionsOverride)                                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuu", moveMode, rate, colorTemperatureMinimum,        \
-                                  colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param moveMode HueMoveMode 
+ * @param rate INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterMoveColorTemperature( \
+  moveMode, \
+  rate, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuu", \
+    moveMode, \
+    rate, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for StepColorTemperature
  *
  * Command: StepColorTemperature
- * @param stepMode HueStepMode
- * @param stepSize INT16U
- * @param transitionTime INT16U
- * @param colorTemperatureMinimum INT16U
- * @param colorTemperatureMaximum INT16U
- * @param optionsMask BITMAP8
- * @param optionsOverride BITMAP8
- */
-#define emberAfFillCommandColor                                                                                                    \
-    ControlClusterStepColorTemperature(stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum,       \
-                                       optionsMask, optionsOverride)                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, "uuuuuuu", stepMode, stepSize, transitionTime,            \
-                                  colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+ * @param stepMode HueStepMode 
+ * @param stepSize INT16U 
+ * @param transitionTime INT16U 
+ * @param colorTemperatureMinimum INT16U 
+ * @param colorTemperatureMaximum INT16U 
+ * @param optionsMask BITMAP8 
+ * @param optionsOverride BITMAP8 
+ */
+#define emberAfFillCommandColor ControlClusterStepColorTemperature( \
+  stepMode, \
+  stepSize, \
+  transitionTime, \
+  colorTemperatureMinimum, \
+  colorTemperatureMaximum, \
+  optionsMask, \
+  optionsOverride \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID, \
+    "uuuuuuu", \
+    stepMode, \
+    stepSize, \
+    transitionTime, \
+    colorTemperatureMinimum, \
+    colorTemperatureMaximum, \
+    optionsMask, \
+    optionsOverride \
+  );
 
 /** @brief Command description for ZoneEnrollResponse
  *
  * Command: ZoneEnrollResponse
- * @param enrollResponseCode IasEnrollResponseCode
- * @param zoneStatus IasZoneStatus
- * @param zoneId INT8U
- * @param extendedStatus BITMAP8
- * @param zoneId INT8U
- * @param delay INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterZoneEnrollResponse(enrollResponseCode, zoneStatus, zoneId, extendedStatus, zoneId, delay)                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uuuuuu", enrollResponseCode, zoneStatus, zoneId,           \
-                                  extendedStatus, zoneId, delay);
+ * @param enrollResponseCode IasEnrollResponseCode 
+ * @param zoneStatus IasZoneStatus 
+ * @param zoneId INT8U 
+ * @param extendedStatus BITMAP8 
+ * @param zoneId INT8U 
+ * @param delay INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterZoneEnrollResponse( \
+  enrollResponseCode, \
+  zoneStatus, \
+  zoneId, \
+  extendedStatus, \
+  zoneId, \
+  delay \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    enrollResponseCode, \
+    zoneStatus, \
+    zoneId, \
+    extendedStatus, \
+    zoneId, \
+    delay \
+  );
 
 /** @brief Command description for InitiateNormalOperationMode
  *
  * Command: InitiateNormalOperationMode
- * @param zoneType IasZoneType
- * @param manufacturerCode INT16U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationMode(zoneType, manufacturerCode)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, "uu", zoneType, manufacturerCode);
+ * @param zoneType IasZoneType 
+ * @param manufacturerCode INT16U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationMode( \
+  zoneType, \
+  manufacturerCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_COMMAND_ID, \
+    "uu", \
+    zoneType, \
+    manufacturerCode \
+  );
 
 /** @brief Command description for InitiateNormalOperationModeResponse
  *
  * Command: InitiateNormalOperationModeResponse
- * @param testModeDuration INT8U
- * @param currentZoneSensitivityLevel INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateNormalOperationModeResponse(testModeDuration, currentZoneSensitivityLevel) emberAfFillExternalBuffer(       \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, "uu", testModeDuration, currentZoneSensitivityLevel);
+ * @param testModeDuration INT8U 
+ * @param currentZoneSensitivityLevel INT8U 
+ */
+#define emberAfFillCommandIAS ZoneClusterInitiateNormalOperationModeResponse( \
+  testModeDuration, \
+  currentZoneSensitivityLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_NORMAL_OPERATION_MODE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    testModeDuration, \
+    currentZoneSensitivityLevel \
+  );
 
 /** @brief Command description for InitiateTestModeResponse
  *
  * Command: InitiateTestModeResponse
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ZoneClusterInitiateTestModeResponse() emberAfFillExternalBuffer(mask,                                                          \
-                                                                                                                                   \
-                                                                    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, "", );
+#define emberAfFillCommandIAS ZoneClusterInitiateTestModeResponse( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_TEST_MODE_RESPONSE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for Arm
  *
  * Command: Arm
- * @param armMode IasAceArmMode
- * @param armNotification IasAceArmNotification
- * @param armDisarmCode CHAR_STRING
- * @param zoneId INT8U
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterArm(armMode, armNotification, armDisarmCode, zoneId)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ARM_COMMAND_ID, "uuuu", armMode, armNotification, armDisarmCode, zoneId);
+ * @param armMode IasAceArmMode 
+ * @param armNotification IasAceArmNotification 
+ * @param armDisarmCode CHAR_STRING 
+ * @param zoneId INT8U 
+ */
+#define emberAfFillCommandIAS ACEClusterArm( \
+  armMode, \
+  armNotification, \
+  armDisarmCode, \
+  zoneId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ARM_COMMAND_ID, \
+    "uuuu", \
+    armMode, \
+    armNotification, \
+    armDisarmCode, \
+    zoneId \
+  );
 
 /** @brief Command description for Bypass
  *
  * Command: Bypass
- * @param numberOfZones INT8U
- * @param section0 BITMAP16
+ * @param numberOfZones INT8U 
+ * @param section0 BITMAP16 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
- * @param section1 BITMAP16
- * @param armDisarmCode CHAR_STRING
- * @param section2 BITMAP16
- * @param section3 BITMAP16
- * @param section4 BITMAP16
- * @param section5 BITMAP16
- * @param section6 BITMAP16
- * @param section7 BITMAP16
- * @param section8 BITMAP16
- * @param section9 BITMAP16
- * @param section10 BITMAP16
- * @param section11 BITMAP16
- * @param section12 BITMAP16
- * @param section13 BITMAP16
- * @param section14 BITMAP16
- * @param section15 BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterBypass(numberOfZones, section0, zoneIds, zoneIdsLen, section1, armDisarmCode, section2, section3, section4,          \
-                     section5, section6, section7, section8, section9, section10, section11, section12, section13, section14,      \
-                     section15)                                                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_BYPASS_COMMAND_ID, "uubuuuuuuuuuuuuuuuu", numberOfZones, section0, zoneIds, zoneIdsLen,      \
-                                  section1, armDisarmCode, section2, section3, section4, section5, section6, section7, section8,   \
-                                  section9, section10, section11, section12, section13, section14, section15);
+ * @param section1 BITMAP16 
+ * @param armDisarmCode CHAR_STRING 
+ * @param section2 BITMAP16 
+ * @param section3 BITMAP16 
+ * @param section4 BITMAP16 
+ * @param section5 BITMAP16 
+ * @param section6 BITMAP16 
+ * @param section7 BITMAP16 
+ * @param section8 BITMAP16 
+ * @param section9 BITMAP16 
+ * @param section10 BITMAP16 
+ * @param section11 BITMAP16 
+ * @param section12 BITMAP16 
+ * @param section13 BITMAP16 
+ * @param section14 BITMAP16 
+ * @param section15 BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterBypass( \
+  numberOfZones, \
+  section0, \
+  zoneIds, zoneIdsLen, \
+  section1, \
+  armDisarmCode, \
+  section2, \
+  section3, \
+  section4, \
+  section5, \
+  section6, \
+  section7, \
+  section8, \
+  section9, \
+  section10, \
+  section11, \
+  section12, \
+  section13, \
+  section14, \
+  section15 \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BYPASS_COMMAND_ID, \
+    "uubuuuuuuuuuuuuuuuu", \
+    numberOfZones, \
+    section0, \
+    zoneIds, zoneIdsLen, \
+    section1, \
+    armDisarmCode, \
+    section2, \
+    section3, \
+    section4, \
+    section5, \
+    section6, \
+    section7, \
+    section8, \
+    section9, \
+    section10, \
+    section11, \
+    section12, \
+    section13, \
+    section14, \
+    section15 \
+  );
 
 /** @brief Command description for Emergency
  *
  * Command: Emergency
- * @param zoneId INT8U
- * @param zoneType IasZoneType
- * @param ieeeAddress IEEE_ADDRESS
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterEmergency(zoneId, zoneType, ieeeAddress, zoneLabel)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EMERGENCY_COMMAND_ID, "uuuu", zoneId, zoneType, ieeeAddress, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneType IasZoneType 
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterEmergency( \
+  zoneId, \
+  zoneType, \
+  ieeeAddress, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneType, \
+    ieeeAddress, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Fire
  *
  * Command: Fire
- * @param zoneId INT8U
- * @param zoneStatus ENUM16
- * @param audibleNotification IasAceAudibleNotification
- * @param zoneLabel CHAR_STRING
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterFire(zoneId, zoneStatus, audibleNotification, zoneLabel)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FIRE_COMMAND_ID, "uuuu", zoneId, zoneStatus, audibleNotification, zoneLabel);
+ * @param zoneId INT8U 
+ * @param zoneStatus ENUM16 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param zoneLabel CHAR_STRING 
+ */
+#define emberAfFillCommandIAS ACEClusterFire( \
+  zoneId, \
+  zoneStatus, \
+  audibleNotification, \
+  zoneLabel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FIRE_COMMAND_ID, \
+    "uuuu", \
+    zoneId, \
+    zoneStatus, \
+    audibleNotification, \
+    zoneLabel \
+  );
 
 /** @brief Command description for Panic
  *
  * Command: Panic
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterPanic(panelStatus, secondsRemaining, audibleNotification, alarmStatus)                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PANIC_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterPanic( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PANIC_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneIdMap
  *
  * Command: GetZoneIdMap
- * @param panelStatus IasAcePanelStatus
- * @param secondsRemaining INT8U
- * @param audibleNotification IasAceAudibleNotification
- * @param alarmStatus IasAceAlarmStatus
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneIdMap(panelStatus, secondsRemaining, audibleNotification, alarmStatus) emberAfFillExternalBuffer(             \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_ID_MAP_COMMAND_ID, "uuuu", panelStatus, secondsRemaining, audibleNotification, alarmStatus);
+ * @param panelStatus IasAcePanelStatus 
+ * @param secondsRemaining INT8U 
+ * @param audibleNotification IasAceAudibleNotification 
+ * @param alarmStatus IasAceAlarmStatus 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneIdMap( \
+  panelStatus, \
+  secondsRemaining, \
+  audibleNotification, \
+  alarmStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_ID_MAP_COMMAND_ID, \
+    "uuuu", \
+    panelStatus, \
+    secondsRemaining, \
+    audibleNotification, \
+    alarmStatus \
+  );
 
 /** @brief Command description for GetZoneInformation
  *
  * Command: GetZoneInformation
- * @param zoneId INT8U
- * @param numberOfZones INT8U
+ * @param zoneId INT8U 
+ * @param numberOfZones INT8U 
  * @param zoneIds INT8U []
  * @param zoneIdsLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneInformation(zoneId, numberOfZones, zoneIds, zoneIdsLen)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ZONE_INFORMATION_COMMAND_ID, "uub", zoneId, numberOfZones, zoneIds, zoneIdsLen);
+#define emberAfFillCommandIAS ACEClusterGetZoneInformation( \
+  zoneId, \
+  numberOfZones, \
+  zoneIds, zoneIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_INFORMATION_COMMAND_ID, \
+    "uub", \
+    zoneId, \
+    numberOfZones, \
+    zoneIds, zoneIdsLen \
+  );
 
 /** @brief Command description for GetPanelStatus
  *
  * Command: GetPanelStatus
- * @param numberOfZones INT8U
+ * @param numberOfZones INT8U 
  * @param bypassResult IasAceBypassResult []
  * @param bypassResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetPanelStatus(numberOfZones, bypassResult, bypassResultLen)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PANEL_STATUS_COMMAND_ID, "ub", numberOfZones, bypassResult, bypassResultLen);
+#define emberAfFillCommandIAS ACEClusterGetPanelStatus( \
+  numberOfZones, \
+  bypassResult, bypassResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PANEL_STATUS_COMMAND_ID, \
+    "ub", \
+    numberOfZones, \
+    bypassResult, bypassResultLen \
+  );
 
 /** @brief Command description for GetBypassedZoneList
  *
  * Command: GetBypassedZoneList
- * @param zoneStatusComplete BOOLEAN
- * @param numberOfZones INT8U
+ * @param zoneStatusComplete BOOLEAN 
+ * @param numberOfZones INT8U 
  * @param zoneStatusResult IasAceZoneStatusResult []
  * @param zoneStatusResultLen int
  */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetBypassedZoneList(zoneStatusComplete, numberOfZones, zoneStatusResult, zoneStatusResultLen)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, "uub", zoneStatusComplete, numberOfZones,                 \
-                                  zoneStatusResult, zoneStatusResultLen);
+#define emberAfFillCommandIAS ACEClusterGetBypassedZoneList( \
+  zoneStatusComplete, \
+  numberOfZones, \
+  zoneStatusResult, zoneStatusResultLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_BYPASSED_ZONE_LIST_COMMAND_ID, \
+    "uub", \
+    zoneStatusComplete, \
+    numberOfZones, \
+    zoneStatusResult, zoneStatusResultLen \
+  );
 
 /** @brief Command description for GetZoneStatus
  *
  * Command: GetZoneStatus
- * @param startingZoneId INT8U
- * @param maxNumberOfZoneIds INT8U
- * @param zoneStatusMaskFlag BOOLEAN
- * @param zoneStatusMask BITMAP16
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    ACEClusterGetZoneStatus(startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_GET_ZONE_STATUS_COMMAND_ID, "uuuu", startingZoneId, maxNumberOfZoneIds, zoneStatusMaskFlag, zoneStatusMask);
+ * @param startingZoneId INT8U 
+ * @param maxNumberOfZoneIds INT8U 
+ * @param zoneStatusMaskFlag BOOLEAN 
+ * @param zoneStatusMask BITMAP16 
+ */
+#define emberAfFillCommandIAS ACEClusterGetZoneStatus( \
+  startingZoneId, \
+  maxNumberOfZoneIds, \
+  zoneStatusMaskFlag, \
+  zoneStatusMask \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ZONE_STATUS_COMMAND_ID, \
+    "uuuu", \
+    startingZoneId, \
+    maxNumberOfZoneIds, \
+    zoneStatusMaskFlag, \
+    zoneStatusMask \
+  );
 
 /** @brief Command description for StartWarning
  *
  * Command: StartWarning
- * @param warningInfo WarningInfo
- * @param warningDuration INT16U
- * @param strobeDutyCycle INT8U
- * @param strobeLevel ENUM8
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterStartWarning(warningInfo, warningDuration, strobeDutyCycle, strobeLevel) emberAfFillExternalBuffer(                   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_START_WARNING_COMMAND_ID, "uuuu", warningInfo, warningDuration, strobeDutyCycle, strobeLevel);
+ * @param warningInfo WarningInfo 
+ * @param warningDuration INT16U 
+ * @param strobeDutyCycle INT8U 
+ * @param strobeLevel ENUM8 
+ */
+#define emberAfFillCommandIAS WDClusterStartWarning( \
+  warningInfo, \
+  warningDuration, \
+  strobeDutyCycle, \
+  strobeLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_WARNING_COMMAND_ID, \
+    "uuuu", \
+    warningInfo, \
+    warningDuration, \
+    strobeDutyCycle, \
+    strobeLevel \
+  );
 
 /** @brief Command description for Squawk
  *
  * Command: Squawk
- * @param squawkInfo SquawkInfo
- */
-#define emberAfFillCommandIAS                                                                                                      \
-    WDClusterSquawk(squawkInfo) emberAfFillExternalBuffer(mask,                                                                    \
-                                                                                                                                   \
-                                                          ZCL_SQUAWK_COMMAND_ID, "u", squawkInfo);
+ * @param squawkInfo SquawkInfo 
+ */
+#define emberAfFillCommandIAS WDClusterSquawk( \
+  squawkInfo \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SQUAWK_COMMAND_ID, \
+    "u", \
+    squawkInfo \
+  );
 
 /** @brief Command description for ChangeChannel
  *
  * Command: ChangeChannel
- * @param match CHAR_STRING
+ * @param match CHAR_STRING 
  * @param ChannelMatch TvChannelInfo []
  * @param ChannelMatchLen int
- * @param ErrorType TvChannelErrorType
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannel(match, ChannelMatch, ChannelMatchLen, ErrorType)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_COMMAND_ID, "ubu", match, ChannelMatch, ChannelMatchLen, ErrorType);
+ * @param ErrorType TvChannelErrorType 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannel( \
+  match, \
+  ChannelMatch, ChannelMatchLen, \
+  ErrorType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_COMMAND_ID, \
+    "ubu", \
+    match, \
+    ChannelMatch, ChannelMatchLen, \
+    ErrorType \
+  );
 
 /** @brief Command description for ChangeChannelByNumber
  *
  * Command: ChangeChannelByNumber
- * @param majorNumber INT16U
- * @param minorNumber INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterChangeChannelByNumber(majorNumber, minorNumber)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, "uu", majorNumber, minorNumber);
+ * @param majorNumber INT16U 
+ * @param minorNumber INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterChangeChannelByNumber( \
+  majorNumber, \
+  minorNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID, \
+    "uu", \
+    majorNumber, \
+    minorNumber \
+  );
 
 /** @brief Command description for SkipChannel
  *
  * Command: SkipChannel
- * @param Count INT16U
- */
-#define emberAfFillCommandTV                                                                                                       \
-    ChannelClusterSkipChannel(Count) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SKIP_CHANNEL_COMMAND_ID, "u", Count);
+ * @param Count INT16U 
+ */
+#define emberAfFillCommandTV ChannelClusterSkipChannel( \
+  Count \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_CHANNEL_COMMAND_ID, \
+    "u", \
+    Count \
+  );
 
 /** @brief Command description for NavigateTarget
  *
  * Command: NavigateTarget
- * @param target INT8U
- * @param status NavigateTargetStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandTarget                                                                                                   \
-    NavigatorClusterNavigateTarget(target, status, data, data)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NAVIGATE_TARGET_COMMAND_ID, "uuuu", target, status, data, data);
+ * @param target INT8U 
+ * @param status NavigateTargetStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandTarget NavigatorClusterNavigateTarget( \
+  target, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NAVIGATE_TARGET_COMMAND_ID, \
+    "uuuu", \
+    target, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for PlayRequest
  *
  * Command: PlayRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPlayRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_PLAY_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPlayRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PLAY_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseRequest
  *
  * Command: PauseRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPauseRequest() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_PAUSE_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPauseRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StopRequest
  *
  * Command: StopRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStopRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_STOP_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStopRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOverRequest
  *
  * Command: StartOverRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterStartOverRequest() emberAfFillExternalBuffer(mask,                                                              \
-                                                                                                                                   \
-                                                                ZCL_START_OVER_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterStartOverRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PreviousRequest
  *
  * Command: PreviousRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterPreviousRequest() emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_PREVIOUS_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterPreviousRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PREVIOUS_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for NextRequest
  *
  * Command: NextRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterNextRequest() emberAfFillExternalBuffer(mask,                                                                   \
-                                                                                                                                   \
-                                                           ZCL_NEXT_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterNextRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NEXT_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RewindRequest
  *
  * Command: RewindRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterRewindRequest() emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_REWIND_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterRewindRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REWIND_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for FastForwardRequest
  *
  * Command: FastForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterFastForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterFastForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FAST_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipForwardRequest
  *
  * Command: SkipForwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipForwardRequest() emberAfFillExternalBuffer(mask,                                                            \
-                                                                                                                                   \
-                                                                  ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipForwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_FORWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SkipBackwardRequest
  *
  * Command: SkipBackwardRequest
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    PlaybackClusterSkipBackwardRequest() emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, "", );
+#define emberAfFillCommandMedia PlaybackClusterSkipBackwardRequest( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SKIP_BACKWARD_REQUEST_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SelectInput
  *
  * Command: SelectInput
- * @param index INT8U
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterSelectInput(index) emberAfFillExternalBuffer(mask,                                                                 \
-                                                                                                                                   \
-                                                             ZCL_SELECT_INPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandMedia InputClusterSelectInput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_INPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for ShowInputStatus
  *
  * Command: ShowInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterShowInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_SHOW_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterShowInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SHOW_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for HideInputStatus
  *
  * Command: HideInputStatus
  */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterHideInputStatus() emberAfFillExternalBuffer(mask,                                                                  \
-                                                                                                                                   \
-                                                            ZCL_HIDE_INPUT_STATUS_COMMAND_ID, "", );
+#define emberAfFillCommandMedia InputClusterHideInputStatus( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_HIDE_INPUT_STATUS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for RenameInput
  *
  * Command: RenameInput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandMedia                                                                                                    \
-    InputClusterRenameInput(index, name) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_RENAME_INPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandMedia InputClusterRenameInput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_INPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for Sleep
  *
  * Command: Sleep
  */
-#define emberAfFillCommandLow                                                                                                      \
-    PowerClusterSleep() emberAfFillExternalBuffer(mask,                                                                            \
-                                                                                                                                   \
-                                                  ZCL_SLEEP_COMMAND_ID, "", );
+#define emberAfFillCommandLow PowerClusterSleep( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SLEEP_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SendKey
  *
  * Command: SendKey
- * @param keyCode INT8U
- * @param status KeypadInputStatus
- */
-#define emberAfFillCommandKeypad                                                                                                   \
-    InputClusterSendKey(keyCode, status) emberAfFillExternalBuffer(mask,                                                           \
-                                                                                                                                   \
-                                                                   ZCL_SEND_KEY_COMMAND_ID, "uu", keyCode, status);
+ * @param keyCode INT8U 
+ * @param status KeypadInputStatus 
+ */
+#define emberAfFillCommandKeypad InputClusterSendKey( \
+  keyCode, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_KEY_COMMAND_ID, \
+    "uu", \
+    keyCode, \
+    status \
+  );
 
 /** @brief Command description for LaunchContent
  *
  * Command: LaunchContent
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchContent(contentLaunchStatus)                                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_CONTENT_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchContent( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_CONTENT_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for LaunchURL
  *
  * Command: LaunchURL
- * @param contentLaunchStatus ContentLaunchStatus
- */
-#define emberAfFillCommandContent                                                                                                  \
-    LaunchClusterLaunchURL(contentLaunchStatus) emberAfFillExternalBuffer(mask,                                                    \
-                                                                                                                                   \
-                                                                          ZCL_LAUNCH_URL_COMMAND_ID, "u", contentLaunchStatus);
+ * @param contentLaunchStatus ContentLaunchStatus 
+ */
+#define emberAfFillCommandContent LaunchClusterLaunchURL( \
+  contentLaunchStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_URL_COMMAND_ID, \
+    "u", \
+    contentLaunchStatus \
+  );
 
 /** @brief Command description for SelectOutput
  *
  * Command: SelectOutput
- * @param index INT8U
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterSelectOutput(index) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_SELECT_OUTPUT_COMMAND_ID, "u", index);
+ * @param index INT8U 
+ */
+#define emberAfFillCommandAudio OutputClusterSelectOutput( \
+  index \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_OUTPUT_COMMAND_ID, \
+    "u", \
+    index \
+  );
 
 /** @brief Command description for RenameOutput
  *
  * Command: RenameOutput
- * @param index INT8U
- * @param name CHAR_STRING
- */
-#define emberAfFillCommandAudio                                                                                                    \
-    OutputClusterRenameOutput(index, name) emberAfFillExternalBuffer(mask,                                                         \
-                                                                                                                                   \
-                                                                     ZCL_RENAME_OUTPUT_COMMAND_ID, "uu", index, name);
+ * @param index INT8U 
+ * @param name CHAR_STRING 
+ */
+#define emberAfFillCommandAudio OutputClusterRenameOutput( \
+  index, \
+  name \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RENAME_OUTPUT_COMMAND_ID, \
+    "uu", \
+    index, \
+    name \
+  );
 
 /** @brief Command description for LaunchApp
  *
  * Command: LaunchApp
  * @param application ApplicationLauncherApp []
  * @param applicationLen int
- * @param status ApplicationLauncherStatus
- * @param data CHAR_STRING
- * @param data CHAR_STRING
- */
-#define emberAfFillCommandApplication                                                                                              \
-    LauncherClusterLaunchApp(application, applicationLen, status, data, data)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LAUNCH_APP_COMMAND_ID, "buuu", application, applicationLen, status, data, data);
+ * @param status ApplicationLauncherStatus 
+ * @param data CHAR_STRING 
+ * @param data CHAR_STRING 
+ */
+#define emberAfFillCommandApplication LauncherClusterLaunchApp( \
+  application, applicationLen, \
+  status, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LAUNCH_APP_COMMAND_ID, \
+    "buuu", \
+    application, applicationLen, \
+    status, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for GetSetupPIN
  *
  * Command: GetSetupPIN
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterGetSetupPIN(tempAccountIdentifier, setupPIN)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SETUP_PIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterGetSetupPIN( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SETUP_PIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for Login
  *
  * Command: Login
- * @param tempAccountIdentifier CHAR_STRING
- * @param setupPIN CHAR_STRING
- */
-#define emberAfFillCommandAccount                                                                                                  \
-    LoginClusterLogin(tempAccountIdentifier, setupPIN)                                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOGIN_COMMAND_ID, "uu", tempAccountIdentifier, setupPIN);
+ * @param tempAccountIdentifier CHAR_STRING 
+ * @param setupPIN CHAR_STRING 
+ */
+#define emberAfFillCommandAccount LoginClusterLogin( \
+  tempAccountIdentifier, \
+  setupPIN \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOGIN_COMMAND_ID, \
+    "uu", \
+    tempAccountIdentifier, \
+    setupPIN \
+  );
 
 /** @brief Command description for MatchProtocolAddress
  *
  * Command: MatchProtocolAddress
- * @param protocolAddress OCTET_STRING
- * @param deviceIeeeAddress IEEE_ADDRESS
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterMatchProtocolAddress(protocolAddress, deviceIeeeAddress, protocolAddress) emberAfFillExternalBuffer(              \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, "uuu", protocolAddress, deviceIeeeAddress, protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ * @param deviceIeeeAddress IEEE_ADDRESS 
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterMatchProtocolAddress( \
+  protocolAddress, \
+  deviceIeeeAddress, \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_MATCH_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "uuu", \
+    protocolAddress, \
+    deviceIeeeAddress, \
+    protocolAddress \
+  );
 
 /** @brief Command description for AdvertiseProtocolAddress
  *
  * Command: AdvertiseProtocolAddress
- * @param protocolAddress OCTET_STRING
- */
-#define emberAfFillCommandGeneric                                                                                                  \
-    TunnelClusterAdvertiseProtocolAddress(protocolAddress)                                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, "u", protocolAddress);
+ * @param protocolAddress OCTET_STRING 
+ */
+#define emberAfFillCommandGeneric TunnelClusterAdvertiseProtocolAddress( \
+  protocolAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ADVERTISE_PROTOCOL_ADDRESS_COMMAND_ID, \
+    "u", \
+    protocolAddress \
+  );
 
 /** @brief Command description for TransferNpdu
  *
@@ -3511,1656 +6007,2960 @@
  * @param npdu DATA8 []
  * @param npduLen int
  */
-#define emberAfFillCommandBACnet                                                                                                   \
-    Protocol TunnelClusterTransferNpdu(npdu, npduLen) emberAfFillExternalBuffer(mask,                                              \
-                                                                                                                                   \
-                                                                                ZCL_TRANSFER_NPDU_COMMAND_ID, "b", npdu, npduLen);
+#define emberAfFillCommandBACnet Protocol TunnelClusterTransferNpdu( \
+  npdu, npduLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_NPDU_COMMAND_ID, \
+    "b", \
+    npdu, npduLen \
+  );
 
 /** @brief Command description for TransferAPDU
  *
  * Command: TransferAPDU
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterTransferAPDU(apdu) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterTransferAPDU( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for ConnectRequest
  *
  * Command: ConnectRequest
- * @param connectControl 11073ConnectRequestConnectControl
- * @param idleTimeout INT16U
- * @param managerTarget IEEE_ADDRESS
- * @param managerEndpoint INT8U
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectRequest(connectControl, idleTimeout, managerTarget, managerEndpoint) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_CONNECT_REQUEST_COMMAND_ID, "uuuu", connectControl, idleTimeout, managerTarget, managerEndpoint);
+ * @param connectControl 11073ConnectRequestConnectControl 
+ * @param idleTimeout INT16U 
+ * @param managerTarget IEEE_ADDRESS 
+ * @param managerEndpoint INT8U 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectRequest( \
+  connectControl, \
+  idleTimeout, \
+  managerTarget, \
+  managerEndpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_REQUEST_COMMAND_ID, \
+    "uuuu", \
+    connectControl, \
+    idleTimeout, \
+    managerTarget, \
+    managerEndpoint \
+  );
 
 /** @brief Command description for DisconnectRequest
  *
  * Command: DisconnectRequest
- * @param managerIEEEAddress IEEE_ADDRESS
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterDisconnectRequest(managerIEEEAddress)                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISCONNECT_REQUEST_COMMAND_ID, "u", managerIEEEAddress);
+ * @param managerIEEEAddress IEEE_ADDRESS 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterDisconnectRequest( \
+  managerIEEEAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISCONNECT_REQUEST_COMMAND_ID, \
+    "u", \
+    managerIEEEAddress \
+  );
 
 /** @brief Command description for ConnectStatusNotification
  *
  * Command: ConnectStatusNotification
- * @param connectStatus 11073TunnelConnectionStatus
- */
-#define emberAfFillCommand11073                                                                                                    \
-    Protocol TunnelClusterConnectStatusNotification(connectStatus)                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, "u", connectStatus);
+ * @param connectStatus 11073TunnelConnectionStatus 
+ */
+#define emberAfFillCommand11073 Protocol TunnelClusterConnectStatusNotification( \
+  connectStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONNECT_STATUS_NOTIFICATION_COMMAND_ID, \
+    "u", \
+    connectStatus \
+  );
 
 /** @brief Command description for TransferApdu
  *
  * Command: TransferApdu
- * @param apdu OCTET_STRING
- */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterTransferApdu(apdu) emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_TRANSFER_APDU_COMMAND_ID, "u", apdu);
+ * @param apdu OCTET_STRING 
+ */
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterTransferApdu( \
+  apdu \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_APDU_COMMAND_ID, \
+    "u", \
+    apdu \
+  );
 
 /** @brief Command description for InsertSmartCard
  *
  * Command: InsertSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterInsertSmartCard() emberAfFillExternalBuffer(mask,                                                   \
-                                                                                                                                   \
-                                                                           ZCL_INSERT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterInsertSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INSERT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ExtractSmartCard
  *
  * Command: ExtractSmartCard
  */
-#define emberAfFillCommandISO                                                                                                      \
-    7816 Protocol TunnelClusterExtractSmartCard() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_EXTRACT_SMART_CARD_COMMAND_ID, "", );
+#define emberAfFillCommandISO 7816 Protocol TunnelClusterExtractSmartCard( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EXTRACT_SMART_CARD_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PublishPrice
  *
  * Command: PublishPrice
- * @param providerId INT32U
- * @param commandOptions AmiCommandOptions
- * @param rateLabel OCTET_STRING
- * @param issuerEventId INT32U
- * @param currentTime UTC_TIME
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier
- * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param price INT32U
- * @param priceRatio INT8U
- * @param generationPrice INT32U
- * @param generationPriceRatio INT8U
- * @param alternateCostDelivered INT32U
- * @param alternateCostUnit AlternateCostUnit
- * @param alternateCostTrailingDigit AlternateCostTrailingDigit
- * @param numberOfBlockThresholds INT8U
- * @param priceControl PriceControlMask
- * @param numberOfGenerationTiers INT8U
- * @param generationTier GenerationTier
- * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers
- * @param extendedPriceTier ExtendedPriceTier
- * @param extendedRegisterTier ExtendedRegisterTier
- */
-#define emberAfFillCommandPriceClusterPublishPrice(                                                                                \
-    providerId, commandOptions, rateLabel, issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,    \
-    numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, generationPriceRatio,     \
-    alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit, numberOfBlockThresholds, priceControl,                  \
-    numberOfGenerationTiers, generationTier, extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuuu", providerId, commandOptions, rateLabel,    \
-                              issuerEventId, currentTime, unitOfMeasure, currency, priceTrailingDigitAndPriceTier,                 \
-                              numberOfPriceTiersAndRegisterTier, startTime, durationInMinutes, price, priceRatio, generationPrice, \
-                              generationPriceRatio, alternateCostDelivered, alternateCostUnit, alternateCostTrailingDigit,         \
-                              numberOfBlockThresholds, priceControl, numberOfGenerationTiers, generationTier,                      \
-                              extendedNumberOfPriceTiers, extendedPriceTier, extendedRegisterTier);
+ * @param providerId INT32U 
+ * @param commandOptions AmiCommandOptions 
+ * @param rateLabel OCTET_STRING 
+ * @param issuerEventId INT32U 
+ * @param currentTime UTC_TIME 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigitAndPriceTier PriceTrailingDigitAndPriceTier 
+ * @param numberOfPriceTiersAndRegisterTier PriceNumberOfPriceTiersAndRegisterTier 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param price INT32U 
+ * @param priceRatio INT8U 
+ * @param generationPrice INT32U 
+ * @param generationPriceRatio INT8U 
+ * @param alternateCostDelivered INT32U 
+ * @param alternateCostUnit AlternateCostUnit 
+ * @param alternateCostTrailingDigit AlternateCostTrailingDigit 
+ * @param numberOfBlockThresholds INT8U 
+ * @param priceControl PriceControlMask 
+ * @param numberOfGenerationTiers INT8U 
+ * @param generationTier GenerationTier 
+ * @param extendedNumberOfPriceTiers ExtendedNumberOfPriceTiers 
+ * @param extendedPriceTier ExtendedPriceTier 
+ * @param extendedRegisterTier ExtendedRegisterTier 
+ */
+#define emberAfFillCommandPriceClusterPublishPrice( \
+  providerId, \
+  commandOptions, \
+  rateLabel, \
+  issuerEventId, \
+  currentTime, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigitAndPriceTier, \
+  numberOfPriceTiersAndRegisterTier, \
+  startTime, \
+  durationInMinutes, \
+  price, \
+  priceRatio, \
+  generationPrice, \
+  generationPriceRatio, \
+  alternateCostDelivered, \
+  alternateCostUnit, \
+  alternateCostTrailingDigit, \
+  numberOfBlockThresholds, \
+  priceControl, \
+  numberOfGenerationTiers, \
+  generationTier, \
+  extendedNumberOfPriceTiers, \
+  extendedPriceTier, \
+  extendedRegisterTier \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    commandOptions, \
+    rateLabel, \
+    issuerEventId, \
+    currentTime, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigitAndPriceTier, \
+    numberOfPriceTiersAndRegisterTier, \
+    startTime, \
+    durationInMinutes, \
+    price, \
+    priceRatio, \
+    generationPrice, \
+    generationPriceRatio, \
+    alternateCostDelivered, \
+    alternateCostUnit, \
+    alternateCostTrailingDigit, \
+    numberOfBlockThresholds, \
+    priceControl, \
+    numberOfGenerationTiers, \
+    generationTier, \
+    extendedNumberOfPriceTiers, \
+    extendedPriceTier, \
+    extendedRegisterTier \
+  );
 
 /** @brief Command description for PublishBlockPeriod
  *
  * Command: PublishBlockPeriod
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param blockPeriodStartTime UTC_TIME
- * @param blockPeriodDuration INT24U
- * @param blockPeriodControl BlockPeriodControl
- * @param blockPeriodDurationType BlockPeriodDurationType
- * @param tariffType TariffType
- * @param tariffResolutionPeriod TariffResolutionPeriod
- */
-#define emberAfFillCommandPriceClusterPublishBlockPeriod(providerId, startTime, issuerEventId, numberOfEvents,                     \
-                                                         blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,            \
-                                                         blockPeriodDurationType, tariffType, tariffResolutionPeriod)              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, startTime, issuerEventId,             \
-                              numberOfEvents, blockPeriodStartTime, blockPeriodDuration, blockPeriodControl,                       \
-                              blockPeriodDurationType, tariffType, tariffResolutionPeriod);
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param blockPeriodStartTime UTC_TIME 
+ * @param blockPeriodDuration INT24U 
+ * @param blockPeriodControl BlockPeriodControl 
+ * @param blockPeriodDurationType BlockPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param tariffResolutionPeriod TariffResolutionPeriod 
+ */
+#define emberAfFillCommandPriceClusterPublishBlockPeriod( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  blockPeriodStartTime, \
+  blockPeriodDuration, \
+  blockPeriodControl, \
+  blockPeriodDurationType, \
+  tariffType, \
+  tariffResolutionPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    blockPeriodStartTime, \
+    blockPeriodDuration, \
+    blockPeriodControl, \
+    blockPeriodDurationType, \
+    tariffType, \
+    tariffResolutionPeriod \
+  );
 
 /** @brief Command description for PublishConversionFactor
  *
  * Command: PublishConversionFactor
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param conversionFactor INT32U
- * @param priceAckTime UTC_TIME
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param control PriceControlMask
- */
-#define emberAfFillCommandPriceClusterPublishConversionFactor(                                                                     \
-    issuerEventId, providerId, startTime, issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control)   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, "uuuuuuuu", issuerEventId, providerId, startTime,          \
-                              issuerEventId, conversionFactor, priceAckTime, conversionFactorTrailingDigit, control);
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param conversionFactor INT32U 
+ * @param priceAckTime UTC_TIME 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param control PriceControlMask 
+ */
+#define emberAfFillCommandPriceClusterPublishConversionFactor( \
+  issuerEventId, \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  conversionFactor, \
+  priceAckTime, \
+  conversionFactorTrailingDigit, \
+  control \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONVERSION_FACTOR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    conversionFactor, \
+    priceAckTime, \
+    conversionFactorTrailingDigit, \
+    control \
+  );
 
 /** @brief Command description for PublishCalorificValue
  *
  * Command: PublishCalorificValue
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param startTime UTC_TIME
- * @param numberOfEvents INT8U
- * @param calorificValue INT32U
- * @param tariffType TariffType
- * @param calorificValueUnit CalorificValueUnit
- * @param calorificValueTrailingDigit CalorificValueTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCalorificValue(issuerEventId, startTime, startTime, numberOfEvents, calorificValue,   \
-                                                            tariffType, calorificValueUnit, calorificValueTrailingDigit)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, startTime,             \
-                              numberOfEvents, calorificValue, tariffType, calorificValueUnit, calorificValueTrailingDigit);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param numberOfEvents INT8U 
+ * @param calorificValue INT32U 
+ * @param tariffType TariffType 
+ * @param calorificValueUnit CalorificValueUnit 
+ * @param calorificValueTrailingDigit CalorificValueTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCalorificValue( \
+  issuerEventId, \
+  startTime, \
+  startTime, \
+  numberOfEvents, \
+  calorificValue, \
+  tariffType, \
+  calorificValueUnit, \
+  calorificValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALORIFIC_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    startTime, \
+    numberOfEvents, \
+    calorificValue, \
+    tariffType, \
+    calorificValueUnit, \
+    calorificValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTariffInformation
  *
  * Command: PublishTariffInformation
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param numberOfCommands INT8U
- * @param startTime UTC_TIME
- * @param tariffTypeChargingScheme TariffTypeChargingScheme
- * @param tariffLabel OCTET_STRING
- * @param numberOfPriceTiersInUse INT8U
- * @param numberOfBlockThresholdsInUse INT8U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param currency INT16U
- * @param priceTrailingDigit PriceTrailingDigit
- * @param standingCharge INT32U
- * @param tierBlockMode TierBlockMode
- * @param blockThresholdMultiplier INT24U
- * @param blockThresholdDivisor INT24U
- */
-#define emberAfFillCommandPriceClusterPublishTariffInformation(                                                                    \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                   \
-    tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse, unitOfMeasure, currency,         \
-    priceTrailingDigit, standingCharge, tierBlockMode, blockThresholdMultiplier, blockThresholdDivisor)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", providerId, earliestStartTime,      \
-                              issuerEventId, minIssuerEventId, issuerTariffId, numberOfCommands, startTime,                        \
-                              tariffTypeChargingScheme, tariffLabel, numberOfPriceTiersInUse, numberOfBlockThresholdsInUse,        \
-                              unitOfMeasure, currency, priceTrailingDigit, standingCharge, tierBlockMode,                          \
-                              blockThresholdMultiplier, blockThresholdDivisor);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param numberOfCommands INT8U 
+ * @param startTime UTC_TIME 
+ * @param tariffTypeChargingScheme TariffTypeChargingScheme 
+ * @param tariffLabel OCTET_STRING 
+ * @param numberOfPriceTiersInUse INT8U 
+ * @param numberOfBlockThresholdsInUse INT8U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param currency INT16U 
+ * @param priceTrailingDigit PriceTrailingDigit 
+ * @param standingCharge INT32U 
+ * @param tierBlockMode TierBlockMode 
+ * @param blockThresholdMultiplier INT24U 
+ * @param blockThresholdDivisor INT24U 
+ */
+#define emberAfFillCommandPriceClusterPublishTariffInformation( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerTariffId, \
+  numberOfCommands, \
+  startTime, \
+  tariffTypeChargingScheme, \
+  tariffLabel, \
+  numberOfPriceTiersInUse, \
+  numberOfBlockThresholdsInUse, \
+  unitOfMeasure, \
+  currency, \
+  priceTrailingDigit, \
+  standingCharge, \
+  tierBlockMode, \
+  blockThresholdMultiplier, \
+  blockThresholdDivisor \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TARIFF_INFORMATION_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerTariffId, \
+    numberOfCommands, \
+    startTime, \
+    tariffTypeChargingScheme, \
+    tariffLabel, \
+    numberOfPriceTiersInUse, \
+    numberOfBlockThresholdsInUse, \
+    unitOfMeasure, \
+    currency, \
+    priceTrailingDigit, \
+    standingCharge, \
+    tierBlockMode, \
+    blockThresholdMultiplier, \
+    blockThresholdDivisor \
+  );
 
 /** @brief Command description for PublishPriceMatrix
  *
  * Command: PublishPriceMatrix
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl PriceMatrixSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl PriceMatrixSubPayloadControl 
  * @param payload PriceMatrixSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishPriceMatrix(providerId, earliestStartTime, issuerEventId, minIssuerEventId,           \
-                                                         startTime, numberOfCommands, issuerTariffId, commandIndex,                \
-                                                         numberOfCommands, subPayloadControl, payload, payloadLen)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, "uuuuuuuuuub", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, startTime, numberOfCommands, issuerTariffId, commandIndex, numberOfCommands,       \
-                              subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishPriceMatrix( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PRICE_MATRIX_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishBlockThresholds
  *
  * Command: PublishBlockThresholds
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param issuerTariffId INT32U
- * @param tariffType TariffType
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param subPayloadControl BlockThresholdSubPayloadControl
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param issuerTariffId INT32U 
+ * @param tariffType TariffType 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param subPayloadControl BlockThresholdSubPayloadControl 
  * @param payload BlockThresholdSubPayload []
  * @param payloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishBlockThresholds(                                                                      \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,       \
-    commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, "uuuuuuuuuuub", providerId, earliestStartTime,              \
-                              issuerEventId, minIssuerEventId, startTime, numberOfCommands, issuerTariffId, tariffType,            \
-                              commandIndex, numberOfCommands, subPayloadControl, payload, payloadLen);
+#define emberAfFillCommandPriceClusterPublishBlockThresholds( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  issuerTariffId, \
+  tariffType, \
+  commandIndex, \
+  numberOfCommands, \
+  subPayloadControl, \
+  payload, payloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BLOCK_THRESHOLDS_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    issuerTariffId, \
+    tariffType, \
+    commandIndex, \
+    numberOfCommands, \
+    subPayloadControl, \
+    payload, payloadLen \
+  );
 
 /** @brief Command description for PublishCO2Value
  *
  * Command: PublishCO2Value
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param tariffType TariffType
- * @param cO2Value INT32U
- * @param cO2ValueUnit CO2Unit
- * @param cO2ValueTrailingDigit CO2TrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishCO2Value(providerId, issuerTariffId, issuerEventId, startTime, tariffType, cO2Value,  \
-                                                      cO2ValueUnit, cO2ValueTrailingDigit)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, "uuuuuuuu", providerId, issuerTariffId, issuerEventId, startTime,  \
-                              tariffType, cO2Value, cO2ValueUnit, cO2ValueTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param tariffType TariffType 
+ * @param cO2Value INT32U 
+ * @param cO2ValueUnit CO2Unit 
+ * @param cO2ValueTrailingDigit CO2TrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishCO2Value( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  startTime, \
+  tariffType, \
+  cO2Value, \
+  cO2ValueUnit, \
+  cO2ValueTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CO2_VALUE_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    startTime, \
+    tariffType, \
+    cO2Value, \
+    cO2ValueUnit, \
+    cO2ValueTrailingDigit \
+  );
 
 /** @brief Command description for PublishTierLabels
  *
  * Command: PublishTierLabels
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param issuerTariffId INT32U
- * @param commandIndex INT8U
- * @param numberOfCommands INT8U
- * @param numberOfLabels INT8U
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param commandIndex INT8U 
+ * @param numberOfCommands INT8U 
+ * @param numberOfLabels INT8U 
  * @param tierLabelsPayload INT8U []
  * @param tierLabelsPayloadLen int
  */
-#define emberAfFillCommandPriceClusterPublishTierLabels(providerId, issuerTariffId, issuerEventId, issuerTariffId, commandIndex,   \
-                                                        numberOfCommands, numberOfLabels, tierLabelsPayload, tierLabelsPayloadLen) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, "uuuuuuub", providerId, issuerTariffId, issuerEventId,           \
-                              issuerTariffId, commandIndex, numberOfCommands, numberOfLabels, tierLabelsPayload,                   \
-                              tierLabelsPayloadLen);
+#define emberAfFillCommandPriceClusterPublishTierLabels( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  issuerTariffId, \
+  commandIndex, \
+  numberOfCommands, \
+  numberOfLabels, \
+  tierLabelsPayload, tierLabelsPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_TIER_LABELS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    issuerTariffId, \
+    commandIndex, \
+    numberOfCommands, \
+    numberOfLabels, \
+    tierLabelsPayload, tierLabelsPayloadLen \
+  );
 
 /** @brief Command description for PublishBillingPeriod
  *
  * Command: PublishBillingPeriod
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param billingPeriodDuration BillingPeriodDuration
- * @param tariffType TariffType
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterPublishBillingPeriod(providerId, earliestStartTime, issuerEventId, minIssuerEventId,         \
-                                                           billingPeriodStartTime, numberOfCommands, billingPeriodDuration,        \
-                                                           tariffType, billingPeriodDurationType, tariffType)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, "uuuuuuuuuu", providerId, earliestStartTime, issuerEventId,   \
-                              minIssuerEventId, billingPeriodStartTime, numberOfCommands, billingPeriodDuration, tariffType,       \
-                              billingPeriodDurationType, tariffType);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param tariffType TariffType 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterPublishBillingPeriod( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  billingPeriodStartTime, \
+  numberOfCommands, \
+  billingPeriodDuration, \
+  tariffType, \
+  billingPeriodDurationType, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_BILLING_PERIOD_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    billingPeriodStartTime, \
+    numberOfCommands, \
+    billingPeriodDuration, \
+    tariffType, \
+    billingPeriodDurationType, \
+    tariffType \
+  );
 
 /** @brief Command description for PublishConsolidatedBill
  *
  * Command: PublishConsolidatedBill
- * @param providerId INT32U
- * @param issuerTariffId INT32U
- * @param issuerEventId INT32U
- * @param billingPeriodStartTime UTC_TIME
- * @param billingPeriodDuration BillingPeriodDuration
- * @param billingPeriodDurationType BillingPeriodDurationType
- * @param tariffType TariffType
- * @param consolidatedBill INT32U
- * @param currency INT16U
- * @param billTrailingDigit BillTrailingDigit
- */
-#define emberAfFillCommandPriceClusterPublishConsolidatedBill(providerId, issuerTariffId, issuerEventId, billingPeriodStartTime,   \
-                                                              billingPeriodDuration, billingPeriodDurationType, tariffType,        \
-                                                              consolidatedBill, currency, billTrailingDigit)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, "uuuuuuuuuu", providerId, issuerTariffId, issuerEventId,   \
-                              billingPeriodStartTime, billingPeriodDuration, billingPeriodDurationType, tariffType,                \
-                              consolidatedBill, currency, billTrailingDigit);
+ * @param providerId INT32U 
+ * @param issuerTariffId INT32U 
+ * @param issuerEventId INT32U 
+ * @param billingPeriodStartTime UTC_TIME 
+ * @param billingPeriodDuration BillingPeriodDuration 
+ * @param billingPeriodDurationType BillingPeriodDurationType 
+ * @param tariffType TariffType 
+ * @param consolidatedBill INT32U 
+ * @param currency INT16U 
+ * @param billTrailingDigit BillTrailingDigit 
+ */
+#define emberAfFillCommandPriceClusterPublishConsolidatedBill( \
+  providerId, \
+  issuerTariffId, \
+  issuerEventId, \
+  billingPeriodStartTime, \
+  billingPeriodDuration, \
+  billingPeriodDurationType, \
+  tariffType, \
+  consolidatedBill, \
+  currency, \
+  billTrailingDigit \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CONSOLIDATED_BILL_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerTariffId, \
+    issuerEventId, \
+    billingPeriodStartTime, \
+    billingPeriodDuration, \
+    billingPeriodDurationType, \
+    tariffType, \
+    consolidatedBill, \
+    currency, \
+    billTrailingDigit \
+  );
 
 /** @brief Command description for PublishCppEvent
  *
  * Command: PublishCppEvent
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param startTime UTC_TIME
- * @param numberOfCommands INT8U
- * @param durationInMinutes INT16U
- * @param tariffType TariffType
- * @param tariffType TariffType
- * @param cppPriceTier CppPriceTier
- * @param cppAuth PublishCppEventCppAuth
- */
-#define emberAfFillCommandPriceClusterPublishCppEvent(providerId, earliestStartTime, issuerEventId, minIssuerEventId, startTime,   \
-                                                      numberOfCommands, durationInMinutes, tariffType, tariffType, cppPriceTier,   \
-                                                      cppAuth)                                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, "uuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,       \
-                              minIssuerEventId, startTime, numberOfCommands, durationInMinutes, tariffType, tariffType,            \
-                              cppPriceTier, cppAuth);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param durationInMinutes INT16U 
+ * @param tariffType TariffType 
+ * @param tariffType TariffType 
+ * @param cppPriceTier CppPriceTier 
+ * @param cppAuth PublishCppEventCppAuth 
+ */
+#define emberAfFillCommandPriceClusterPublishCppEvent( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  startTime, \
+  numberOfCommands, \
+  durationInMinutes, \
+  tariffType, \
+  tariffType, \
+  cppPriceTier, \
+  cppAuth \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CPP_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    startTime, \
+    numberOfCommands, \
+    durationInMinutes, \
+    tariffType, \
+    tariffType, \
+    cppPriceTier, \
+    cppAuth \
+  );
 
 /** @brief Command description for PublishCreditPayment
  *
  * Command: PublishCreditPayment
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param creditPaymentDueDate UTC_TIME
- * @param numberOfCommands INT8U
- * @param creditPaymentOverDueAmount INT32U
- * @param tariffType TariffType
- * @param creditPaymentStatus CreditPaymentStatus
- * @param creditPayment INT32U
- * @param creditPaymentDate UTC_TIME
- * @param creditPaymentRef OCTET_STRING
- */
-#define emberAfFillCommandPriceClusterPublishCreditPayment(                                                                        \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, creditPaymentDueDate, numberOfCommands,                        \
-    creditPaymentOverDueAmount, tariffType, creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef)               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, "uuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId, \
-                              minIssuerEventId, creditPaymentDueDate, numberOfCommands, creditPaymentOverDueAmount, tariffType,    \
-                              creditPaymentStatus, creditPayment, creditPaymentDate, creditPaymentRef);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param creditPaymentDueDate UTC_TIME 
+ * @param numberOfCommands INT8U 
+ * @param creditPaymentOverDueAmount INT32U 
+ * @param tariffType TariffType 
+ * @param creditPaymentStatus CreditPaymentStatus 
+ * @param creditPayment INT32U 
+ * @param creditPaymentDate UTC_TIME 
+ * @param creditPaymentRef OCTET_STRING 
+ */
+#define emberAfFillCommandPriceClusterPublishCreditPayment( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  creditPaymentDueDate, \
+  numberOfCommands, \
+  creditPaymentOverDueAmount, \
+  tariffType, \
+  creditPaymentStatus, \
+  creditPayment, \
+  creditPaymentDate, \
+  creditPaymentRef \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CREDIT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    creditPaymentDueDate, \
+    numberOfCommands, \
+    creditPaymentOverDueAmount, \
+    tariffType, \
+    creditPaymentStatus, \
+    creditPayment, \
+    creditPaymentDate, \
+    creditPaymentRef \
+  );
 
 /** @brief Command description for PublishCurrencyConversion
  *
  * Command: PublishCurrencyConversion
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param cppAuth CppEventResponseCppAuth
- * @param startTime UTC_TIME
- * @param oldCurrency INT16U
- * @param newCurrency INT16U
- * @param conversionFactor INT32U
- * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit
- * @param currencyChangeControlFlags CurrencyChangeControl
- */
-#define emberAfFillCommandPriceClusterPublishCurrencyConversion(providerId, issuerEventId, issuerEventId, cppAuth, startTime,      \
-                                                                oldCurrency, newCurrency, conversionFactor,                        \
-                                                                conversionFactorTrailingDigit, currencyChangeControlFlags)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, "uuuuuuuuuu", providerId, issuerEventId, issuerEventId,  \
-                              cppAuth, startTime, oldCurrency, newCurrency, conversionFactor, conversionFactorTrailingDigit,       \
-                              currencyChangeControlFlags);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param cppAuth CppEventResponseCppAuth 
+ * @param startTime UTC_TIME 
+ * @param oldCurrency INT16U 
+ * @param newCurrency INT16U 
+ * @param conversionFactor INT32U 
+ * @param conversionFactorTrailingDigit ConversionFactorTrailingDigit 
+ * @param currencyChangeControlFlags CurrencyChangeControl 
+ */
+#define emberAfFillCommandPriceClusterPublishCurrencyConversion( \
+  providerId, \
+  issuerEventId, \
+  issuerEventId, \
+  cppAuth, \
+  startTime, \
+  oldCurrency, \
+  newCurrency, \
+  conversionFactor, \
+  conversionFactorTrailingDigit, \
+  currencyChangeControlFlags \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CURRENCY_CONVERSION_COMMAND_ID, \
+    "uuuuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    issuerEventId, \
+    cppAuth, \
+    startTime, \
+    oldCurrency, \
+    newCurrency, \
+    conversionFactor, \
+    conversionFactorTrailingDigit, \
+    currencyChangeControlFlags \
+  );
 
 /** @brief Command description for CancelTariff
  *
  * Command: CancelTariff
- * @param providerId INT32U
- * @param latestEndTime UTC_TIME
- * @param issuerTariffId INT32U
- * @param numberOfRecords INT8U
- * @param tariffType TariffType
- */
-#define emberAfFillCommandPriceClusterCancelTariff(providerId, latestEndTime, issuerTariffId, numberOfRecords, tariffType)         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_TARIFF_COMMAND_ID, "uuuuu", providerId, latestEndTime, issuerTariffId, numberOfRecords,   \
-                              tariffType);
+ * @param providerId INT32U 
+ * @param latestEndTime UTC_TIME 
+ * @param issuerTariffId INT32U 
+ * @param numberOfRecords INT8U 
+ * @param tariffType TariffType 
+ */
+#define emberAfFillCommandPriceClusterCancelTariff( \
+  providerId, \
+  latestEndTime, \
+  issuerTariffId, \
+  numberOfRecords, \
+  tariffType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_TARIFF_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    latestEndTime, \
+    issuerTariffId, \
+    numberOfRecords, \
+    tariffType \
+  );
 
 /** @brief Command description for GetCurrencyConversionCommand
  *
  * Command: GetCurrencyConversionCommand
  */
-#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand()                                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetCurrencyConversionCommand( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CURRENCY_CONVERSION_COMMAND_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for GetTariffCancellation
  *
  * Command: GetTariffCancellation
  */
-#define emberAfFillCommandPriceClusterGetTariffCancellation()                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, "", );
+#define emberAfFillCommandPriceClusterGetTariffCancellation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TARIFF_CANCELLATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for LoadControlEvent
  *
  * Command: LoadControlEvent
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param deviceClass AmiDeviceClass
- * @param eventStatus AmiEventStatus
- * @param utilityEnrollmentGroup INT8U
- * @param eventStatusTime UTC_TIME
- * @param startTime UTC_TIME
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param durationInMinutes INT16U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param criticalityLevel AmiCriticalityLevel
- * @param heatingTemperatureSetPointApplied INT16U
- * @param coolingTemperatureOffset INT8U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param heatingTemperatureOffset INT8U
- * @param dutyCycleApplied INT8U
- * @param coolingTemperatureSetPoint INT16S
- * @param eventControl AmiEventControl
- * @param heatingTemperatureSetPoint INT16S
- * @param signatureType SignatureType
- * @param averageLoadAdjustmentPercentage INT8S
- * @param signature Signature
- * @param dutyCycle INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterLoadControlEvent(                                                                              \
-        issuerEventId, issuerEventId, deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                \
-        criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel,                           \
-        heatingTemperatureSetPointApplied, coolingTemperatureOffset, averageLoadAdjustmentPercentageApplied,                       \
-        heatingTemperatureOffset, dutyCycleApplied, coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint,          \
-        signatureType, averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuuuuuuuuuuuuuuuuuu", issuerEventId, issuerEventId,     \
-                                  deviceClass, eventStatus, utilityEnrollmentGroup, eventStatusTime, startTime,                    \
-                                  criticalityLevelApplied, durationInMinutes, coolingTemperatureSetPointApplied, criticalityLevel, \
-                                  heatingTemperatureSetPointApplied, coolingTemperatureOffset,                                     \
-                                  averageLoadAdjustmentPercentageApplied, heatingTemperatureOffset, dutyCycleApplied,              \
-                                  coolingTemperatureSetPoint, eventControl, heatingTemperatureSetPoint, signatureType,             \
-                                  averageLoadAdjustmentPercentage, signature, dutyCycle, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatus AmiEventStatus 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param eventStatusTime UTC_TIME 
+ * @param startTime UTC_TIME 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param durationInMinutes INT16U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param criticalityLevel AmiCriticalityLevel 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param coolingTemperatureOffset INT8U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param heatingTemperatureOffset INT8U 
+ * @param dutyCycleApplied INT8U 
+ * @param coolingTemperatureSetPoint INT16S 
+ * @param eventControl AmiEventControl 
+ * @param heatingTemperatureSetPoint INT16S 
+ * @param signatureType SignatureType 
+ * @param averageLoadAdjustmentPercentage INT8S 
+ * @param signature Signature 
+ * @param dutyCycle INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterLoadControlEvent( \
+  issuerEventId, \
+  issuerEventId, \
+  deviceClass, \
+  eventStatus, \
+  utilityEnrollmentGroup, \
+  eventStatusTime, \
+  startTime, \
+  criticalityLevelApplied, \
+  durationInMinutes, \
+  coolingTemperatureSetPointApplied, \
+  criticalityLevel, \
+  heatingTemperatureSetPointApplied, \
+  coolingTemperatureOffset, \
+  averageLoadAdjustmentPercentageApplied, \
+  heatingTemperatureOffset, \
+  dutyCycleApplied, \
+  coolingTemperatureSetPoint, \
+  eventControl, \
+  heatingTemperatureSetPoint, \
+  signatureType, \
+  averageLoadAdjustmentPercentage, \
+  signature, \
+  dutyCycle, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    deviceClass, \
+    eventStatus, \
+    utilityEnrollmentGroup, \
+    eventStatusTime, \
+    startTime, \
+    criticalityLevelApplied, \
+    durationInMinutes, \
+    coolingTemperatureSetPointApplied, \
+    criticalityLevel, \
+    heatingTemperatureSetPointApplied, \
+    coolingTemperatureOffset, \
+    averageLoadAdjustmentPercentageApplied, \
+    heatingTemperatureOffset, \
+    dutyCycleApplied, \
+    coolingTemperatureSetPoint, \
+    eventControl, \
+    heatingTemperatureSetPoint, \
+    signatureType, \
+    averageLoadAdjustmentPercentage, \
+    signature, \
+    dutyCycle, \
+    eventControl \
+  );
 
 /** @brief Command description for CancelLoadControlEvent
  *
  * Command: CancelLoadControlEvent
- * @param issuerEventId INT32U
- * @param startTime UTC_TIME
- * @param deviceClass AmiDeviceClass
- * @param numberOfEvents INT8U
- * @param utilityEnrollmentGroup INT8U
- * @param issuerEventId INT32U
- * @param cancelControl AmiCancelControl
- * @param effectiveTime UTC_TIME
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelLoadControlEvent(issuerEventId, startTime, deviceClass, numberOfEvents,                  \
-                                                           utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, "uuuuuuuu", issuerEventId, startTime, deviceClass,     \
-                                  numberOfEvents, utilityEnrollmentGroup, issuerEventId, cancelControl, effectiveTime);
+ * @param issuerEventId INT32U 
+ * @param startTime UTC_TIME 
+ * @param deviceClass AmiDeviceClass 
+ * @param numberOfEvents INT8U 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param issuerEventId INT32U 
+ * @param cancelControl AmiCancelControl 
+ * @param effectiveTime UTC_TIME 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelLoadControlEvent( \
+  issuerEventId, \
+  startTime, \
+  deviceClass, \
+  numberOfEvents, \
+  utilityEnrollmentGroup, \
+  issuerEventId, \
+  cancelControl, \
+  effectiveTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_LOAD_CONTROL_EVENT_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    startTime, \
+    deviceClass, \
+    numberOfEvents, \
+    utilityEnrollmentGroup, \
+    issuerEventId, \
+    cancelControl, \
+    effectiveTime \
+  );
 
 /** @brief Command description for CancelAllLoadControlEvents
  *
  * Command: CancelAllLoadControlEvents
- * @param cancelControl AmiCancelControl
- */
-#define emberAfFillCommandDemand                                                                                                   \
-    Response and Load ControlClusterCancelAllLoadControlEvents(cancelControl)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, "u", cancelControl);
+ * @param cancelControl AmiCancelControl 
+ */
+#define emberAfFillCommandDemand Response and Load ControlClusterCancelAllLoadControlEvents( \
+  cancelControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_LOAD_CONTROL_EVENTS_COMMAND_ID, \
+    "u", \
+    cancelControl \
+  );
 
 /** @brief Command description for GetProfileResponse
  *
  * Command: GetProfileResponse
- * @param endTime UTC_TIME
- * @param intervalChannel AmiIntervalChannel
- * @param status AmiGetProfileStatus
- * @param endTime UTC_TIME
- * @param profileIntervalPeriod AmiIntervalPeriod
- * @param numberOfPeriods INT8U
- * @param numberOfPeriodsDelivered INT8U
+ * @param endTime UTC_TIME 
+ * @param intervalChannel AmiIntervalChannel 
+ * @param status AmiGetProfileStatus 
+ * @param endTime UTC_TIME 
+ * @param profileIntervalPeriod AmiIntervalPeriod 
+ * @param numberOfPeriods INT8U 
+ * @param numberOfPeriodsDelivered INT8U 
  * @param intervals INT24U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetProfileResponse(endTime, intervalChannel, status, endTime, profileIntervalPeriod, numberOfPeriods,           \
-                                      numberOfPeriodsDelivered, intervals, intervalsLen)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, "uuuuuuub", endTime, intervalChannel, status, endTime,      \
-                                  profileIntervalPeriod, numberOfPeriods, numberOfPeriodsDelivered, intervals, intervalsLen);
+#define emberAfFillCommandSimple MeteringClusterGetProfileResponse( \
+  endTime, \
+  intervalChannel, \
+  status, \
+  endTime, \
+  profileIntervalPeriod, \
+  numberOfPeriods, \
+  numberOfPeriodsDelivered, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_RESPONSE_COMMAND_ID, \
+    "uuuuuuub", \
+    endTime, \
+    intervalChannel, \
+    status, \
+    endTime, \
+    profileIntervalPeriod, \
+    numberOfPeriods, \
+    numberOfPeriodsDelivered, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for RequestMirror
  *
  * Command: RequestMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestMirror(endpointId) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_REQUEST_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RemoveMirror
  *
  * Command: RemoveMirror
- * @param endpointId INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRemoveMirror(endpointId) emberAfFillExternalBuffer(mask,                                                        \
-                                                                                                                                   \
-                                                                      ZCL_REMOVE_MIRROR_COMMAND_ID, "u", endpointId);
+ * @param endpointId INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRemoveMirror( \
+  endpointId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_MIRROR_COMMAND_ID, \
+    "u", \
+    endpointId \
+  );
 
 /** @brief Command description for RequestFastPollModeResponse
  *
  * Command: RequestFastPollModeResponse
- * @param appliedUpdatePeriod INT8U
- * @param fastPollUpdatePeriod INT8U
- * @param fastPollModeEndtime UTC_TIME
- * @param duration INT8U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterRequestFastPollModeResponse(appliedUpdatePeriod, fastPollUpdatePeriod, fastPollModeEndtime, duration)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, "uuuu", appliedUpdatePeriod,                     \
-                                  fastPollUpdatePeriod, fastPollModeEndtime, duration);
+ * @param appliedUpdatePeriod INT8U 
+ * @param fastPollUpdatePeriod INT8U 
+ * @param fastPollModeEndtime UTC_TIME 
+ * @param duration INT8U 
+ */
+#define emberAfFillCommandSimple MeteringClusterRequestFastPollModeResponse( \
+  appliedUpdatePeriod, \
+  fastPollUpdatePeriod, \
+  fastPollModeEndtime, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_FAST_POLL_MODE_RESPONSE_COMMAND_ID, \
+    "uuuu", \
+    appliedUpdatePeriod, \
+    fastPollUpdatePeriod, \
+    fastPollModeEndtime, \
+    duration \
+  );
 
 /** @brief Command description for ScheduleSnapshotResponse
  *
  * Command: ScheduleSnapshotResponse
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
  * @param snapshotResponsePayload SnapshotResponsePayload []
  * @param snapshotResponsePayloadLen int
- * @param commandIndex INT8U
- * @param commandCount INT8U
+ * @param commandIndex INT8U 
+ * @param commandCount INT8U 
  * @param snapshotSchedulePayload SnapshotSchedulePayload []
  * @param snapshotSchedulePayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterScheduleSnapshotResponse(issuerEventId, issuerEventId, snapshotResponsePayload, snapshotResponsePayloadLen,     \
-                                            commandIndex, commandCount, snapshotSchedulePayload, snapshotSchedulePayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, "uubuub", issuerEventId, issuerEventId,               \
-                                  snapshotResponsePayload, snapshotResponsePayloadLen, commandIndex, commandCount,                 \
-                                  snapshotSchedulePayload, snapshotSchedulePayloadLen);
+#define emberAfFillCommandSimple MeteringClusterScheduleSnapshotResponse( \
+  issuerEventId, \
+  issuerEventId, \
+  snapshotResponsePayload, snapshotResponsePayloadLen, \
+  commandIndex, \
+  commandCount, \
+  snapshotSchedulePayload, snapshotSchedulePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCHEDULE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uubuub", \
+    issuerEventId, \
+    issuerEventId, \
+    snapshotResponsePayload, snapshotResponsePayloadLen, \
+    commandIndex, \
+    commandCount, \
+    snapshotSchedulePayload, snapshotSchedulePayloadLen \
+  );
 
 /** @brief Command description for TakeSnapshotResponse
  *
  * Command: TakeSnapshotResponse
- * @param snapshotId INT32U
- * @param snapshotCause SnapshotCause
- * @param snapshotConfirmation SnapshotConfirmation
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterTakeSnapshotResponse(snapshotId, snapshotCause, snapshotConfirmation)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, "uuu", snapshotId, snapshotCause, snapshotConfirmation);
+ * @param snapshotId INT32U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotConfirmation SnapshotConfirmation 
+ */
+#define emberAfFillCommandSimple MeteringClusterTakeSnapshotResponse( \
+  snapshotId, \
+  snapshotCause, \
+  snapshotConfirmation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TAKE_SNAPSHOT_RESPONSE_COMMAND_ID, \
+    "uuu", \
+    snapshotId, \
+    snapshotCause, \
+    snapshotConfirmation \
+  );
 
 /** @brief Command description for PublishSnapshot
  *
  * Command: PublishSnapshot
- * @param snapshotId INT32U
- * @param earliestStartTime UTC_TIME
- * @param snapshotTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param snapshotOffset INT8U
- * @param commandIndex INT8U
- * @param snapshotCause SnapshotCause
- * @param totalCommands INT8U
- * @param snapshotCause SnapshotCause
- * @param snapshotPayloadType SnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param snapshotTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param snapshotOffset INT8U 
+ * @param commandIndex INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param totalCommands INT8U 
+ * @param snapshotCause SnapshotCause 
+ * @param snapshotPayloadType SnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterPublishSnapshot(snapshotId, earliestStartTime, snapshotTime, latestEndTime, totalSnapshotsFound,                \
-                                   snapshotOffset, commandIndex, snapshotCause, totalCommands, snapshotCause, snapshotPayloadType, \
-                                   snapshotPayload, snapshotPayloadLen)                                                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, "uuuuuuuuuuub", snapshotId, earliestStartTime, snapshotTime,    \
-                                  latestEndTime, totalSnapshotsFound, snapshotOffset, commandIndex, snapshotCause, totalCommands,  \
-                                  snapshotCause, snapshotPayloadType, snapshotPayload, snapshotPayloadLen);
+#define emberAfFillCommandSimple MeteringClusterPublishSnapshot( \
+  snapshotId, \
+  earliestStartTime, \
+  snapshotTime, \
+  latestEndTime, \
+  totalSnapshotsFound, \
+  snapshotOffset, \
+  commandIndex, \
+  snapshotCause, \
+  totalCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuuuuuub", \
+    snapshotId, \
+    earliestStartTime, \
+    snapshotTime, \
+    latestEndTime, \
+    totalSnapshotsFound, \
+    snapshotOffset, \
+    commandIndex, \
+    snapshotCause, \
+    totalCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for GetSampledDataResponse
  *
  * Command: GetSampledDataResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param sampleStartTime UTC_TIME
- * @param startSamplingTime UTC_TIME
- * @param sampleType SampleType
- * @param sampleType SampleType
- * @param sampleRequestInterval INT16U
- * @param sampleRequestInterval INT16U
- * @param numberOfSamples INT16U
- * @param maxNumberOfSamples INT16U
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param sampleStartTime UTC_TIME 
+ * @param startSamplingTime UTC_TIME 
+ * @param sampleType SampleType 
+ * @param sampleType SampleType 
+ * @param sampleRequestInterval INT16U 
+ * @param sampleRequestInterval INT16U 
+ * @param numberOfSamples INT16U 
+ * @param maxNumberOfSamples INT16U 
  * @param samples INT24U []
  * @param samplesLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetSampledDataResponse(sampleId, issuerEventId, sampleStartTime, startSamplingTime, sampleType, sampleType,     \
-                                          sampleRequestInterval, sampleRequestInterval, numberOfSamples, maxNumberOfSamples,       \
-                                          samples, samplesLen)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, "uuuuuuuuuub", sampleId, issuerEventId,                \
-                                  sampleStartTime, startSamplingTime, sampleType, sampleType, sampleRequestInterval,               \
-                                  sampleRequestInterval, numberOfSamples, maxNumberOfSamples, samples, samplesLen);
+#define emberAfFillCommandSimple MeteringClusterGetSampledDataResponse( \
+  sampleId, \
+  issuerEventId, \
+  sampleStartTime, \
+  startSamplingTime, \
+  sampleType, \
+  sampleType, \
+  sampleRequestInterval, \
+  sampleRequestInterval, \
+  numberOfSamples, \
+  maxNumberOfSamples, \
+  samples, samplesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SAMPLED_DATA_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuub", \
+    sampleId, \
+    issuerEventId, \
+    sampleStartTime, \
+    startSamplingTime, \
+    sampleType, \
+    sampleType, \
+    sampleRequestInterval, \
+    sampleRequestInterval, \
+    numberOfSamples, \
+    maxNumberOfSamples, \
+    samples, samplesLen \
+  );
 
 /** @brief Command description for ConfigureMirror
  *
  * Command: ConfigureMirror
- * @param issuerEventId INT32U
- * @param sampleId INT16U
- * @param reportingInterval INT24U
- * @param earliestSampleTime UTC_TIME
- * @param mirrorNotificationReporting BOOLEAN
- * @param sampleType SampleType
- * @param notificationScheme INT8U
- * @param numberOfSamples INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureMirror(issuerEventId, sampleId, reportingInterval, earliestSampleTime, mirrorNotificationReporting,    \
-                                   sampleType, notificationScheme, numberOfSamples)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_MIRROR_COMMAND_ID, "uuuuuuuu", issuerEventId, sampleId, reportingInterval,         \
-                                  earliestSampleTime, mirrorNotificationReporting, sampleType, notificationScheme,                 \
-                                  numberOfSamples);
+ * @param issuerEventId INT32U 
+ * @param sampleId INT16U 
+ * @param reportingInterval INT24U 
+ * @param earliestSampleTime UTC_TIME 
+ * @param mirrorNotificationReporting BOOLEAN 
+ * @param sampleType SampleType 
+ * @param notificationScheme INT8U 
+ * @param numberOfSamples INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureMirror( \
+  issuerEventId, \
+  sampleId, \
+  reportingInterval, \
+  earliestSampleTime, \
+  mirrorNotificationReporting, \
+  sampleType, \
+  notificationScheme, \
+  numberOfSamples \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_MIRROR_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    sampleId, \
+    reportingInterval, \
+    earliestSampleTime, \
+    mirrorNotificationReporting, \
+    sampleType, \
+    notificationScheme, \
+    numberOfSamples \
+  );
 
 /** @brief Command description for ConfigureNotificationScheme
  *
  * Command: ConfigureNotificationScheme
- * @param issuerEventId INT32U
- * @param notificationScheme INT8U
- * @param notificationScheme INT8U
+ * @param issuerEventId INT32U 
+ * @param notificationScheme INT8U 
+ * @param notificationScheme INT8U 
  * @param notificationFlags BITMAP32 []
  * @param notificationFlagsLen int
- * @param notificationFlagOrder BITMAP32
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationScheme(issuerEventId, notificationScheme, notificationScheme, notificationFlags,           \
-                                               notificationFlagsLen, notificationFlagOrder)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, "uuubu", issuerEventId, notificationScheme,        \
-                                  notificationScheme, notificationFlags, notificationFlagsLen, notificationFlagOrder);
+ * @param notificationFlagOrder BITMAP32 
+ */
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationScheme( \
+  issuerEventId, \
+  notificationScheme, \
+  notificationScheme, \
+  notificationFlags, notificationFlagsLen, \
+  notificationFlagOrder \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_SCHEME_COMMAND_ID, \
+    "uuubu", \
+    issuerEventId, \
+    notificationScheme, \
+    notificationScheme, \
+    notificationFlags, notificationFlagsLen, \
+    notificationFlagOrder \
+  );
 
 /** @brief Command description for ConfigureNotificationFlags
  *
  * Command: ConfigureNotificationFlags
- * @param issuerEventId INT32U
- * @param providerId INT32U
- * @param notificationScheme INT8U
- * @param issuerEventId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param clusterId INT16U
- * @param manufacturerCode INT16U
- * @param numberOfCommands INT8U
+ * @param issuerEventId INT32U 
+ * @param providerId INT32U 
+ * @param notificationScheme INT8U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param clusterId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param numberOfCommands INT8U 
  * @param commandIds INT8U []
  * @param commandIdsLen int
  */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterConfigureNotificationFlags(issuerEventId, providerId, notificationScheme, issuerEventId,                        \
-                                              notificationFlagAttributeId, clusterId, manufacturerCode, numberOfCommands,          \
-                                              commandIds, commandIdsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, "uuuuuuuub", issuerEventId, providerId,             \
-                                  notificationScheme, issuerEventId, notificationFlagAttributeId, clusterId, manufacturerCode,     \
-                                  numberOfCommands, commandIds, commandIdsLen);
+#define emberAfFillCommandSimple MeteringClusterConfigureNotificationFlags( \
+  issuerEventId, \
+  providerId, \
+  notificationScheme, \
+  issuerEventId, \
+  notificationFlagAttributeId, \
+  clusterId, \
+  manufacturerCode, \
+  numberOfCommands, \
+  commandIds, commandIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NOTIFICATION_FLAGS_COMMAND_ID, \
+    "uuuuuuuub", \
+    issuerEventId, \
+    providerId, \
+    notificationScheme, \
+    issuerEventId, \
+    notificationFlagAttributeId, \
+    clusterId, \
+    manufacturerCode, \
+    numberOfCommands, \
+    commandIds, commandIdsLen \
+  );
 
 /** @brief Command description for GetNotifiedMessage
  *
  * Command: GetNotifiedMessage
- * @param notificationScheme INT8U
- * @param providerId INT32U
- * @param notificationFlagAttributeId INT16U
- * @param issuerEventId INT32U
- * @param notificationFlagsN BITMAP32
- * @param requestDateTime UTC_TIME
- * @param implementationDateTime UTC_TIME
- * @param proposedSupplyStatus MeteringSupplyStatus
- * @param supplyControlBits SupplyControlBits
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterGetNotifiedMessage(notificationScheme, providerId, notificationFlagAttributeId, issuerEventId,                  \
-                                      notificationFlagsN, requestDateTime, implementationDateTime, proposedSupplyStatus,           \
-                                      supplyControlBits)                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, "uuuuuuuuu", notificationScheme, providerId,                \
-                                  notificationFlagAttributeId, issuerEventId, notificationFlagsN, requestDateTime,                 \
-                                  implementationDateTime, proposedSupplyStatus, supplyControlBits);
+ * @param notificationScheme INT8U 
+ * @param providerId INT32U 
+ * @param notificationFlagAttributeId INT16U 
+ * @param issuerEventId INT32U 
+ * @param notificationFlagsN BITMAP32 
+ * @param requestDateTime UTC_TIME 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedSupplyStatus MeteringSupplyStatus 
+ * @param supplyControlBits SupplyControlBits 
+ */
+#define emberAfFillCommandSimple MeteringClusterGetNotifiedMessage( \
+  notificationScheme, \
+  providerId, \
+  notificationFlagAttributeId, \
+  issuerEventId, \
+  notificationFlagsN, \
+  requestDateTime, \
+  implementationDateTime, \
+  proposedSupplyStatus, \
+  supplyControlBits \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NOTIFIED_MESSAGE_COMMAND_ID, \
+    "uuuuuuuuu", \
+    notificationScheme, \
+    providerId, \
+    notificationFlagAttributeId, \
+    issuerEventId, \
+    notificationFlagsN, \
+    requestDateTime, \
+    implementationDateTime, \
+    proposedSupplyStatus, \
+    supplyControlBits \
+  );
 
 /** @brief Command description for SupplyStatusResponse
  *
  * Command: SupplyStatusResponse
- * @param providerId INT32U
- * @param proposedSupplyStatus ProposedSupplyStatus
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param supplyStatus MeteringSupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSupplyStatusResponse(providerId, proposedSupplyStatus, issuerEventId, implementationDateTime, supplyStatus)     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, "uuuuu", providerId, proposedSupplyStatus, issuerEventId, \
-                                  implementationDateTime, supplyStatus);
+ * @param providerId INT32U 
+ * @param proposedSupplyStatus ProposedSupplyStatus 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param supplyStatus MeteringSupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterSupplyStatusResponse( \
+  providerId, \
+  proposedSupplyStatus, \
+  issuerEventId, \
+  implementationDateTime, \
+  supplyStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUPPLY_STATUS_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    proposedSupplyStatus, \
+    issuerEventId, \
+    implementationDateTime, \
+    supplyStatus \
+  );
 
 /** @brief Command description for StartSamplingResponse
  *
  * Command: StartSamplingResponse
- * @param sampleId INT16U
- * @param issuerEventId INT32U
- * @param supplyTamperState SupplyStatus
- * @param supplyDepletionState SupplyStatus
- * @param supplyUncontrolledFlowState SupplyStatus
- * @param loadLimitSupplyState SupplyStatus
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterStartSamplingResponse(sampleId, issuerEventId, supplyTamperState, supplyDepletionState,                         \
-                                         supplyUncontrolledFlowState, loadLimitSupplyState)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, "uuuuuu", sampleId, issuerEventId, supplyTamperState,    \
-                                  supplyDepletionState, supplyUncontrolledFlowState, loadLimitSupplyState);
+ * @param sampleId INT16U 
+ * @param issuerEventId INT32U 
+ * @param supplyTamperState SupplyStatus 
+ * @param supplyDepletionState SupplyStatus 
+ * @param supplyUncontrolledFlowState SupplyStatus 
+ * @param loadLimitSupplyState SupplyStatus 
+ */
+#define emberAfFillCommandSimple MeteringClusterStartSamplingResponse( \
+  sampleId, \
+  issuerEventId, \
+  supplyTamperState, \
+  supplyDepletionState, \
+  supplyUncontrolledFlowState, \
+  loadLimitSupplyState \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_SAMPLING_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    sampleId, \
+    issuerEventId, \
+    supplyTamperState, \
+    supplyDepletionState, \
+    supplyUncontrolledFlowState, \
+    loadLimitSupplyState \
+  );
 
 /** @brief Command description for SetUncontrolledFlowThreshold
  *
  * Command: SetUncontrolledFlowThreshold
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param uncontrolledFlowThreshold INT16U
- * @param unitOfMeasure AmiUnitOfMeasure
- * @param multiplier INT16U
- * @param divisor INT16U
- * @param stabilisationPeriod INT8U
- * @param measurementPeriod INT16U
- */
-#define emberAfFillCommandSimple                                                                                                   \
-    MeteringClusterSetUncontrolledFlowThreshold(providerId, issuerEventId, uncontrolledFlowThreshold, unitOfMeasure, multiplier,   \
-                                                divisor, stabilisationPeriod, measurementPeriod)                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, "uuuuuuuu", providerId, issuerEventId,           \
-                                  uncontrolledFlowThreshold, unitOfMeasure, multiplier, divisor, stabilisationPeriod,              \
-                                  measurementPeriod);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param uncontrolledFlowThreshold INT16U 
+ * @param unitOfMeasure AmiUnitOfMeasure 
+ * @param multiplier INT16U 
+ * @param divisor INT16U 
+ * @param stabilisationPeriod INT8U 
+ * @param measurementPeriod INT16U 
+ */
+#define emberAfFillCommandSimple MeteringClusterSetUncontrolledFlowThreshold( \
+  providerId, \
+  issuerEventId, \
+  uncontrolledFlowThreshold, \
+  unitOfMeasure, \
+  multiplier, \
+  divisor, \
+  stabilisationPeriod, \
+  measurementPeriod \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_UNCONTROLLED_FLOW_THRESHOLD_COMMAND_ID, \
+    "uuuuuuuu", \
+    providerId, \
+    issuerEventId, \
+    uncontrolledFlowThreshold, \
+    unitOfMeasure, \
+    multiplier, \
+    divisor, \
+    stabilisationPeriod, \
+    measurementPeriod \
+  );
 
 /** @brief Command description for GetLastMessage
  *
  * Command: GetLastMessage
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterGetLastMessage(messageId, messageControl, startTime, durationInMinutes, message,         \
-                                                         optionalExtendedMessageControl)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_LAST_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageControl, startTime, durationInMinutes,  \
-                              message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterGetLastMessage( \
+  messageId, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_LAST_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelMessage
  *
  * Command: CancelMessage
- * @param messageId INT32U
- * @param messageId INT32U
- * @param messageControl MessagingControlMask
- * @param confirmationTime UTC_TIME
- * @param messageConfirmationControl BITMAP8
- * @param messageResponse OCTET_STRING
- */
-#define emberAfFillCommandMessagingClusterCancelMessage(messageId, messageId, messageControl, confirmationTime,                    \
-                                                        messageConfirmationControl, messageResponse)                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_MESSAGE_COMMAND_ID, "uuuuuu", messageId, messageId, messageControl, confirmationTime,     \
-                              messageConfirmationControl, messageResponse);
+ * @param messageId INT32U 
+ * @param messageId INT32U 
+ * @param messageControl MessagingControlMask 
+ * @param confirmationTime UTC_TIME 
+ * @param messageConfirmationControl BITMAP8 
+ * @param messageResponse OCTET_STRING 
+ */
+#define emberAfFillCommandMessagingClusterCancelMessage( \
+  messageId, \
+  messageId, \
+  messageControl, \
+  confirmationTime, \
+  messageConfirmationControl, \
+  messageResponse \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    messageId, \
+    messageId, \
+    messageControl, \
+    confirmationTime, \
+    messageConfirmationControl, \
+    messageResponse \
+  );
 
 /** @brief Command description for DisplayProtectedMessage
  *
  * Command: DisplayProtectedMessage
- * @param messageId INT32U
- * @param earliestImplementationTime UTC_TIME
- * @param messageControl MessagingControlMask
- * @param startTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param message CHAR_STRING
- * @param optionalExtendedMessageControl MessagingExtendedControlMask
- */
-#define emberAfFillCommandMessagingClusterDisplayProtectedMessage(                                                                 \
-    messageId, earliestImplementationTime, messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, "uuuuuuu", messageId, earliestImplementationTime,          \
-                              messageControl, startTime, durationInMinutes, message, optionalExtendedMessageControl);
+ * @param messageId INT32U 
+ * @param earliestImplementationTime UTC_TIME 
+ * @param messageControl MessagingControlMask 
+ * @param startTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param message CHAR_STRING 
+ * @param optionalExtendedMessageControl MessagingExtendedControlMask 
+ */
+#define emberAfFillCommandMessagingClusterDisplayProtectedMessage( \
+  messageId, \
+  earliestImplementationTime, \
+  messageControl, \
+  startTime, \
+  durationInMinutes, \
+  message, \
+  optionalExtendedMessageControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISPLAY_PROTECTED_MESSAGE_COMMAND_ID, \
+    "uuuuuuu", \
+    messageId, \
+    earliestImplementationTime, \
+    messageControl, \
+    startTime, \
+    durationInMinutes, \
+    message, \
+    optionalExtendedMessageControl \
+  );
 
 /** @brief Command description for CancelAllMessages
  *
  * Command: CancelAllMessages
- * @param implementationDateTime UTC_TIME
- */
-#define emberAfFillCommandMessagingClusterCancelAllMessages(implementationDateTime)                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, "u", implementationDateTime);
+ * @param implementationDateTime UTC_TIME 
+ */
+#define emberAfFillCommandMessagingClusterCancelAllMessages( \
+  implementationDateTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CANCEL_ALL_MESSAGES_COMMAND_ID, \
+    "u", \
+    implementationDateTime \
+  );
 
 /** @brief Command description for RequestTunnel
  *
  * Command: RequestTunnel
- * @param protocolId INT8U
- * @param tunnelId INT16U
- * @param manufacturerCode INT16U
- * @param tunnelStatus TunnelingTunnelStatus
- * @param flowControlSupport BOOLEAN
- * @param maximumIncomingTransferSize INT16U
- * @param maximumIncomingTransferSize INT16U
- */
-#define emberAfFillCommandTunnelingClusterRequestTunnel(protocolId, tunnelId, manufacturerCode, tunnelStatus, flowControlSupport,  \
-                                                        maximumIncomingTransferSize, maximumIncomingTransferSize)                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_TUNNEL_COMMAND_ID, "uuuuuuu", protocolId, tunnelId, manufacturerCode, tunnelStatus,      \
-                              flowControlSupport, maximumIncomingTransferSize, maximumIncomingTransferSize);
+ * @param protocolId INT8U 
+ * @param tunnelId INT16U 
+ * @param manufacturerCode INT16U 
+ * @param tunnelStatus TunnelingTunnelStatus 
+ * @param flowControlSupport BOOLEAN 
+ * @param maximumIncomingTransferSize INT16U 
+ * @param maximumIncomingTransferSize INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterRequestTunnel( \
+  protocolId, \
+  tunnelId, \
+  manufacturerCode, \
+  tunnelStatus, \
+  flowControlSupport, \
+  maximumIncomingTransferSize, \
+  maximumIncomingTransferSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TUNNEL_COMMAND_ID, \
+    "uuuuuuu", \
+    protocolId, \
+    tunnelId, \
+    manufacturerCode, \
+    tunnelStatus, \
+    flowControlSupport, \
+    maximumIncomingTransferSize, \
+    maximumIncomingTransferSize \
+  );
 
 /** @brief Command description for CloseTunnel
  *
  * Command: CloseTunnel
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
  */
-#define emberAfFillCommandTunnelingClusterCloseTunnel(tunnelId, tunnelId, data, dataLen)                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLOSE_TUNNEL_COMMAND_ID, "uub", tunnelId, tunnelId, data, dataLen);
+#define emberAfFillCommandTunnelingClusterCloseTunnel( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLOSE_TUNNEL_COMMAND_ID, \
+    "uub", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen \
+  );
 
 /** @brief Command description for TransferDataClientToServer
  *
  * Command: TransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
  * @param data INT8U []
  * @param dataLen int
- * @param transferDataStatus TunnelingTransferDataStatus
- */
-#define emberAfFillCommandTunnelingClusterTransferDataClientToServer(tunnelId, tunnelId, data, dataLen, transferDataStatus)        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uubu", tunnelId, tunnelId, data, dataLen,            \
-                              transferDataStatus);
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  data, dataLen, \
+  transferDataStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uubu", \
+    tunnelId, \
+    tunnelId, \
+    data, dataLen, \
+    transferDataStatus \
+  );
 
 /** @brief Command description for TransferDataErrorClientToServer
  *
  * Command: TransferDataErrorClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param transferDataStatus TunnelingTransferDataStatus
- * @param numberOfBytesLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer(tunnelId, tunnelId, transferDataStatus,                  \
-                                                                          numberOfBytesLeft)                                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, transferDataStatus, \
-                              numberOfBytesLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param transferDataStatus TunnelingTransferDataStatus 
+ * @param numberOfBytesLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterTransferDataErrorClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  transferDataStatus, \
+  numberOfBytesLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRANSFER_DATA_ERROR_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    transferDataStatus, \
+    numberOfBytesLeft \
+  );
 
 /** @brief Command description for AckTransferDataClientToServer
  *
  * Command: AckTransferDataClientToServer
- * @param tunnelId INT16U
- * @param tunnelId INT16U
- * @param numberOfBytesLeft INT16U
- * @param numberOfOctetsLeft INT16U
- */
-#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer(tunnelId, tunnelId, numberOfBytesLeft, numberOfOctetsLeft) \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuu", tunnelId, tunnelId, numberOfBytesLeft,    \
-                              numberOfOctetsLeft);
+ * @param tunnelId INT16U 
+ * @param tunnelId INT16U 
+ * @param numberOfBytesLeft INT16U 
+ * @param numberOfOctetsLeft INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterAckTransferDataClientToServer( \
+  tunnelId, \
+  tunnelId, \
+  numberOfBytesLeft, \
+  numberOfOctetsLeft \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACK_TRANSFER_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuu", \
+    tunnelId, \
+    tunnelId, \
+    numberOfBytesLeft, \
+    numberOfOctetsLeft \
+  );
 
 /** @brief Command description for ReadyDataClientToServer
  *
  * Command: ReadyDataClientToServer
- * @param tunnelId INT16U
- * @param protocolListComplete BOOLEAN
- * @param numberOfOctetsLeft INT16U
- * @param protocolCount INT8U
+ * @param tunnelId INT16U 
+ * @param protocolListComplete BOOLEAN 
+ * @param numberOfOctetsLeft INT16U 
+ * @param protocolCount INT8U 
  * @param protocolList Protocol []
  * @param protocolListLen int
  */
-#define emberAfFillCommandTunnelingClusterReadyDataClientToServer(tunnelId, protocolListComplete, numberOfOctetsLeft,              \
-                                                                  protocolCount, protocolList, protocolListLen)                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, "uuuub", tunnelId, protocolListComplete,                 \
-                              numberOfOctetsLeft, protocolCount, protocolList, protocolListLen);
+#define emberAfFillCommandTunnelingClusterReadyDataClientToServer( \
+  tunnelId, \
+  protocolListComplete, \
+  numberOfOctetsLeft, \
+  protocolCount, \
+  protocolList, protocolListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READY_DATA_CLIENT_TO_SERVER_COMMAND_ID, \
+    "uuuub", \
+    tunnelId, \
+    protocolListComplete, \
+    numberOfOctetsLeft, \
+    protocolCount, \
+    protocolList, protocolListLen \
+  );
 
 /** @brief Command description for GetSupportedTunnelProtocols
  *
  * Command: GetSupportedTunnelProtocols
- * @param protocolOffset INT8U
- * @param tunnelId INT16U
- */
-#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols(protocolOffset, tunnelId)                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, "uu", protocolOffset, tunnelId);
+ * @param protocolOffset INT8U 
+ * @param tunnelId INT16U 
+ */
+#define emberAfFillCommandTunnelingClusterGetSupportedTunnelProtocols( \
+  protocolOffset, \
+  tunnelId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUPPORTED_TUNNEL_PROTOCOLS_COMMAND_ID, \
+    "uu", \
+    protocolOffset, \
+    tunnelId \
+  );
 
 /** @brief Command description for SelectAvailableEmergencyCredit
  *
  * Command: SelectAvailableEmergencyCredit
- * @param commandIssueDateTime UTC_TIME
- * @param originatingDevice OriginatingDevice
- */
-#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit(commandIssueDateTime, originatingDevice)                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, "uu", commandIssueDateTime, originatingDevice);
+ * @param commandIssueDateTime UTC_TIME 
+ * @param originatingDevice OriginatingDevice 
+ */
+#define emberAfFillCommandPrepaymentClusterSelectAvailableEmergencyCredit( \
+  commandIssueDateTime, \
+  originatingDevice \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SELECT_AVAILABLE_EMERGENCY_CREDIT_COMMAND_ID, \
+    "uu", \
+    commandIssueDateTime, \
+    originatingDevice \
+  );
 
 /** @brief Command description for PublishPrepaySnapshot
  *
  * Command: PublishPrepaySnapshot
- * @param snapshotId INT32U
- * @param snapshotTime UTC_TIME
- * @param totalSnapshotsFound INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- * @param snapshotPayloadType PrepaySnapshotPayloadType
+ * @param snapshotId INT32U 
+ * @param snapshotTime UTC_TIME 
+ * @param totalSnapshotsFound INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ * @param snapshotPayloadType PrepaySnapshotPayloadType 
  * @param snapshotPayload INT8U []
  * @param snapshotPayloadLen int
  */
-#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot(snapshotId, snapshotTime, totalSnapshotsFound, commandIndex,      \
-                                                                 totalNumberOfCommands, snapshotCause, snapshotPayloadType,        \
-                                                                 snapshotPayload, snapshotPayloadLen)                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, "uuuuuuub", snapshotId, snapshotTime, totalSnapshotsFound,   \
-                              commandIndex, totalNumberOfCommands, snapshotCause, snapshotPayloadType, snapshotPayload,            \
-                              snapshotPayloadLen);
+#define emberAfFillCommandPrepaymentClusterPublishPrepaySnapshot( \
+  snapshotId, \
+  snapshotTime, \
+  totalSnapshotsFound, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  snapshotCause, \
+  snapshotPayloadType, \
+  snapshotPayload, snapshotPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuuuuub", \
+    snapshotId, \
+    snapshotTime, \
+    totalSnapshotsFound, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    snapshotCause, \
+    snapshotPayloadType, \
+    snapshotPayload, snapshotPayloadLen \
+  );
 
 /** @brief Command description for ChangeDebt
  *
  * Command: ChangeDebt
- * @param issuerEventId INT32U
- * @param friendlyCredit FriendlyCredit
- * @param debtLabel OCTET_STRING
- * @param friendlyCreditCalendarId INT32U
- * @param debtAmount INT32U
- * @param emergencyCreditLimit INT32U
- * @param debtRecoveryMethod DebtRecoveryMethod
- * @param emergencyCreditThreshold INT32U
- * @param debtAmountType DebtAmountType
- * @param debtRecoveryStartTime UTC_TIME
- * @param debtRecoveryCollectionTime INT16U
- * @param debtRecoveryFrequency DebtRecoveryFrequency
- * @param debtRecoveryAmount INT32U
- * @param debtRecoveryBalancePercentage INT16U
- */
-#define emberAfFillCommandPrepaymentClusterChangeDebt(                                                                             \
-    issuerEventId, friendlyCredit, debtLabel, friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,      \
-    emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime, debtRecoveryFrequency,            \
-    debtRecoveryAmount, debtRecoveryBalancePercentage)                                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_DEBT_COMMAND_ID, "uuuuuuuuuuuuuu", issuerEventId, friendlyCredit, debtLabel,              \
-                              friendlyCreditCalendarId, debtAmount, emergencyCreditLimit, debtRecoveryMethod,                      \
-                              emergencyCreditThreshold, debtAmountType, debtRecoveryStartTime, debtRecoveryCollectionTime,         \
-                              debtRecoveryFrequency, debtRecoveryAmount, debtRecoveryBalancePercentage);
+ * @param issuerEventId INT32U 
+ * @param friendlyCredit FriendlyCredit 
+ * @param debtLabel OCTET_STRING 
+ * @param friendlyCreditCalendarId INT32U 
+ * @param debtAmount INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param debtRecoveryMethod DebtRecoveryMethod 
+ * @param emergencyCreditThreshold INT32U 
+ * @param debtAmountType DebtAmountType 
+ * @param debtRecoveryStartTime UTC_TIME 
+ * @param debtRecoveryCollectionTime INT16U 
+ * @param debtRecoveryFrequency DebtRecoveryFrequency 
+ * @param debtRecoveryAmount INT32U 
+ * @param debtRecoveryBalancePercentage INT16U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangeDebt( \
+  issuerEventId, \
+  friendlyCredit, \
+  debtLabel, \
+  friendlyCreditCalendarId, \
+  debtAmount, \
+  emergencyCreditLimit, \
+  debtRecoveryMethod, \
+  emergencyCreditThreshold, \
+  debtAmountType, \
+  debtRecoveryStartTime, \
+  debtRecoveryCollectionTime, \
+  debtRecoveryFrequency, \
+  debtRecoveryAmount, \
+  debtRecoveryBalancePercentage \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_DEBT_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    issuerEventId, \
+    friendlyCredit, \
+    debtLabel, \
+    friendlyCreditCalendarId, \
+    debtAmount, \
+    emergencyCreditLimit, \
+    debtRecoveryMethod, \
+    emergencyCreditThreshold, \
+    debtAmountType, \
+    debtRecoveryStartTime, \
+    debtRecoveryCollectionTime, \
+    debtRecoveryFrequency, \
+    debtRecoveryAmount, \
+    debtRecoveryBalancePercentage \
+  );
 
 /** @brief Command description for EmergencyCreditSetup
  *
  * Command: EmergencyCreditSetup
- * @param issuerEventId INT32U
- * @param resultType ResultType
- * @param startTime UTC_TIME
- * @param topUpValue INT32U
- * @param emergencyCreditLimit INT32U
- * @param sourceOfTopUp OriginatingDevice
- * @param emergencyCreditThreshold INT32U
- * @param creditRemaining INT32U
- */
-#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup(issuerEventId, resultType, startTime, topUpValue,                  \
-                                                                emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold,     \
-                                                                creditRemaining)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, "uuuuuuuu", issuerEventId, resultType, startTime, topUpValue, \
-                              emergencyCreditLimit, sourceOfTopUp, emergencyCreditThreshold, creditRemaining);
+ * @param issuerEventId INT32U 
+ * @param resultType ResultType 
+ * @param startTime UTC_TIME 
+ * @param topUpValue INT32U 
+ * @param emergencyCreditLimit INT32U 
+ * @param sourceOfTopUp OriginatingDevice 
+ * @param emergencyCreditThreshold INT32U 
+ * @param creditRemaining INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterEmergencyCreditSetup( \
+  issuerEventId, \
+  resultType, \
+  startTime, \
+  topUpValue, \
+  emergencyCreditLimit, \
+  sourceOfTopUp, \
+  emergencyCreditThreshold, \
+  creditRemaining \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EMERGENCY_CREDIT_SETUP_COMMAND_ID, \
+    "uuuuuuuu", \
+    issuerEventId, \
+    resultType, \
+    startTime, \
+    topUpValue, \
+    emergencyCreditLimit, \
+    sourceOfTopUp, \
+    emergencyCreditThreshold, \
+    creditRemaining \
+  );
 
 /** @brief Command description for ConsumerTopUp
  *
  * Command: ConsumerTopUp
- * @param originatingDevice OriginatingDevice
- * @param topUpCode OCTET_STRING
- */
-#define emberAfFillCommandPrepaymentClusterConsumerTopUp(originatingDevice, topUpCode)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONSUMER_TOP_UP_COMMAND_ID, "uu", originatingDevice, topUpCode);
+ * @param originatingDevice OriginatingDevice 
+ * @param topUpCode OCTET_STRING 
+ */
+#define emberAfFillCommandPrepaymentClusterConsumerTopUp( \
+  originatingDevice, \
+  topUpCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONSUMER_TOP_UP_COMMAND_ID, \
+    "uu", \
+    originatingDevice, \
+    topUpCode \
+  );
 
 /** @brief Command description for CreditAdjustment
  *
  * Command: CreditAdjustment
- * @param issuerEventId INT32U
- * @param commandIndex INT8U
- * @param startTime UTC_TIME
- * @param totalNumberOfCommands INT8U
- * @param creditAdjustmentType CreditAdjustmentType
+ * @param issuerEventId INT32U 
+ * @param commandIndex INT8U 
+ * @param startTime UTC_TIME 
+ * @param totalNumberOfCommands INT8U 
+ * @param creditAdjustmentType CreditAdjustmentType 
  * @param topUpPayload TopUpPayload []
  * @param topUpPayloadLen int
- * @param creditAdjustmentValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterCreditAdjustment(issuerEventId, commandIndex, startTime, totalNumberOfCommands,         \
-                                                            creditAdjustmentType, topUpPayload, topUpPayloadLen,                   \
-                                                            creditAdjustmentValue)                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, "uuuuubu", issuerEventId, commandIndex, startTime,                 \
-                              totalNumberOfCommands, creditAdjustmentType, topUpPayload, topUpPayloadLen, creditAdjustmentValue);
+ * @param creditAdjustmentValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterCreditAdjustment( \
+  issuerEventId, \
+  commandIndex, \
+  startTime, \
+  totalNumberOfCommands, \
+  creditAdjustmentType, \
+  topUpPayload, topUpPayloadLen, \
+  creditAdjustmentValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CREDIT_ADJUSTMENT_COMMAND_ID, \
+    "uuuuubu", \
+    issuerEventId, \
+    commandIndex, \
+    startTime, \
+    totalNumberOfCommands, \
+    creditAdjustmentType, \
+    topUpPayload, topUpPayloadLen, \
+    creditAdjustmentValue \
+  );
 
 /** @brief Command description for ChangePaymentMode
  *
  * Command: ChangePaymentMode
- * @param providerId INT32U
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalNumberOfCommands INT8U
- * @param implementationDateTime UTC_TIME
+ * @param providerId INT32U 
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalNumberOfCommands INT8U 
+ * @param implementationDateTime UTC_TIME 
  * @param debtPayload DebtPayload []
  * @param debtPayloadLen int
- * @param proposedPaymentControlConfiguration PaymentControlConfiguration
- * @param cutOffValue INT32U
- */
-#define emberAfFillCommandPrepaymentClusterChangePaymentMode(providerId, commandIndex, issuerEventId, totalNumberOfCommands,       \
-                                                             implementationDateTime, debtPayload, debtPayloadLen,                  \
-                                                             proposedPaymentControlConfiguration, cutOffValue)                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, "uuuuubuu", providerId, commandIndex, issuerEventId,             \
-                              totalNumberOfCommands, implementationDateTime, debtPayload, debtPayloadLen,                          \
-                              proposedPaymentControlConfiguration, cutOffValue);
+ * @param proposedPaymentControlConfiguration PaymentControlConfiguration 
+ * @param cutOffValue INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterChangePaymentMode( \
+  providerId, \
+  commandIndex, \
+  issuerEventId, \
+  totalNumberOfCommands, \
+  implementationDateTime, \
+  debtPayload, debtPayloadLen, \
+  proposedPaymentControlConfiguration, \
+  cutOffValue \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHANGE_PAYMENT_MODE_COMMAND_ID, \
+    "uuuuubuu", \
+    providerId, \
+    commandIndex, \
+    issuerEventId, \
+    totalNumberOfCommands, \
+    implementationDateTime, \
+    debtPayload, debtPayloadLen, \
+    proposedPaymentControlConfiguration, \
+    cutOffValue \
+  );
 
 /** @brief Command description for GetPrepaySnapshot
  *
  * Command: GetPrepaySnapshot
- * @param earliestStartTime UTC_TIME
- * @param latestEndTime UTC_TIME
- * @param snapshotOffset INT8U
- * @param snapshotCause PrepaySnapshotPayloadCause
- */
-#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot(earliestStartTime, latestEndTime, snapshotOffset, snapshotCause)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, "uuuu", earliestStartTime, latestEndTime, snapshotOffset,        \
-                              snapshotCause);
+ * @param earliestStartTime UTC_TIME 
+ * @param latestEndTime UTC_TIME 
+ * @param snapshotOffset INT8U 
+ * @param snapshotCause PrepaySnapshotPayloadCause 
+ */
+#define emberAfFillCommandPrepaymentClusterGetPrepaySnapshot( \
+  earliestStartTime, \
+  latestEndTime, \
+  snapshotOffset, \
+  snapshotCause \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PREPAY_SNAPSHOT_COMMAND_ID, \
+    "uuuu", \
+    earliestStartTime, \
+    latestEndTime, \
+    snapshotOffset, \
+    snapshotCause \
+  );
 
 /** @brief Command description for GetTopUpLog
  *
  * Command: GetTopUpLog
- * @param latestEndTime UTC_TIME
- * @param numberOfRecords INT8U
- */
-#define emberAfFillCommandPrepaymentClusterGetTopUpLog(latestEndTime, numberOfRecords)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_TOP_UP_LOG_COMMAND_ID, "uu", latestEndTime, numberOfRecords);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfRecords INT8U 
+ */
+#define emberAfFillCommandPrepaymentClusterGetTopUpLog( \
+  latestEndTime, \
+  numberOfRecords \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_TOP_UP_LOG_COMMAND_ID, \
+    "uu", \
+    latestEndTime, \
+    numberOfRecords \
+  );
 
 /** @brief Command description for SetLowCreditWarningLevel
  *
  * Command: SetLowCreditWarningLevel
- * @param lowCreditWarningLevel INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel(lowCreditWarningLevel)                                         \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, "u", lowCreditWarningLevel);
+ * @param lowCreditWarningLevel INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetLowCreditWarningLevel( \
+  lowCreditWarningLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_LOW_CREDIT_WARNING_LEVEL_COMMAND_ID, \
+    "u", \
+    lowCreditWarningLevel \
+  );
 
 /** @brief Command description for GetDebtRepaymentLog
  *
  * Command: GetDebtRepaymentLog
- * @param latestEndTime UTC_TIME
- * @param numberOfDebts INT8U
- * @param debtType RepaymentDebtType
- */
-#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog(latestEndTime, numberOfDebts, debtType)                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, "uuu", latestEndTime, numberOfDebts, debtType);
+ * @param latestEndTime UTC_TIME 
+ * @param numberOfDebts INT8U 
+ * @param debtType RepaymentDebtType 
+ */
+#define emberAfFillCommandPrepaymentClusterGetDebtRepaymentLog( \
+  latestEndTime, \
+  numberOfDebts, \
+  debtType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_DEBT_REPAYMENT_LOG_COMMAND_ID, \
+    "uuu", \
+    latestEndTime, \
+    numberOfDebts, \
+    debtType \
+  );
 
 /** @brief Command description for SetMaximumCreditLimit
  *
  * Command: SetMaximumCreditLimit
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param maximumCreditLevel INT32U
- * @param maximumCreditPerTopUp INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit(providerId, issuerEventId, implementationDateTime,                \
-                                                                 maximumCreditLevel, maximumCreditPerTopUp)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, "uuuuu", providerId, issuerEventId, implementationDateTime, \
-                              maximumCreditLevel, maximumCreditPerTopUp);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param maximumCreditLevel INT32U 
+ * @param maximumCreditPerTopUp INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetMaximumCreditLimit( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  maximumCreditLevel, \
+  maximumCreditPerTopUp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAXIMUM_CREDIT_LIMIT_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    maximumCreditLevel, \
+    maximumCreditPerTopUp \
+  );
 
 /** @brief Command description for SetOverallDebtCap
  *
  * Command: SetOverallDebtCap
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param overallDebtCap INT32U
- */
-#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap(providerId, issuerEventId, implementationDateTime, overallDebtCap)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, "uuuu", providerId, issuerEventId, implementationDateTime,      \
-                              overallDebtCap);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param overallDebtCap INT32U 
+ */
+#define emberAfFillCommandPrepaymentClusterSetOverallDebtCap( \
+  providerId, \
+  issuerEventId, \
+  implementationDateTime, \
+  overallDebtCap \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_OVERALL_DEBT_CAP_COMMAND_ID, \
+    "uuuu", \
+    providerId, \
+    issuerEventId, \
+    implementationDateTime, \
+    overallDebtCap \
+  );
 
 /** @brief Command description for ReportEventStatus
  *
  * Command: ReportEventStatus
- * @param issuerEventId INT32U
- * @param issuerEventId INT32U
- * @param eventStatus AmiEventStatus
- * @param deviceClass AmiDeviceClass
- * @param eventStatusTime UTC_TIME
- * @param utilityEnrollmentGroup INT8U
- * @param criticalityLevelApplied AmiCriticalityLevel
- * @param actionRequired INT8U
- * @param coolingTemperatureSetPointApplied INT16U
- * @param heatingTemperatureSetPointApplied INT16U
- * @param averageLoadAdjustmentPercentageApplied INT8S
- * @param dutyCycleApplied INT8U
- * @param eventControl AmiEventControl
- */
-#define emberAfFillCommandEnergy                                                                                                   \
-    ManagementClusterReportEventStatus(issuerEventId, issuerEventId, eventStatus, deviceClass, eventStatusTime,                    \
-                                       utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,                            \
-                                       coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                       \
-                                       averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_STATUS_COMMAND_ID, "uuuuuuuuuuuuu", issuerEventId, issuerEventId, eventStatus,  \
-                                  deviceClass, eventStatusTime, utilityEnrollmentGroup, criticalityLevelApplied, actionRequired,   \
-                                  coolingTemperatureSetPointApplied, heatingTemperatureSetPointApplied,                            \
-                                  averageLoadAdjustmentPercentageApplied, dutyCycleApplied, eventControl);
+ * @param issuerEventId INT32U 
+ * @param issuerEventId INT32U 
+ * @param eventStatus AmiEventStatus 
+ * @param deviceClass AmiDeviceClass 
+ * @param eventStatusTime UTC_TIME 
+ * @param utilityEnrollmentGroup INT8U 
+ * @param criticalityLevelApplied AmiCriticalityLevel 
+ * @param actionRequired INT8U 
+ * @param coolingTemperatureSetPointApplied INT16U 
+ * @param heatingTemperatureSetPointApplied INT16U 
+ * @param averageLoadAdjustmentPercentageApplied INT8S 
+ * @param dutyCycleApplied INT8U 
+ * @param eventControl AmiEventControl 
+ */
+#define emberAfFillCommandEnergy ManagementClusterReportEventStatus( \
+  issuerEventId, \
+  issuerEventId, \
+  eventStatus, \
+  deviceClass, \
+  eventStatusTime, \
+  utilityEnrollmentGroup, \
+  criticalityLevelApplied, \
+  actionRequired, \
+  coolingTemperatureSetPointApplied, \
+  heatingTemperatureSetPointApplied, \
+  averageLoadAdjustmentPercentageApplied, \
+  dutyCycleApplied, \
+  eventControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_STATUS_COMMAND_ID, \
+    "uuuuuuuuuuuuu", \
+    issuerEventId, \
+    issuerEventId, \
+    eventStatus, \
+    deviceClass, \
+    eventStatusTime, \
+    utilityEnrollmentGroup, \
+    criticalityLevelApplied, \
+    actionRequired, \
+    coolingTemperatureSetPointApplied, \
+    heatingTemperatureSetPointApplied, \
+    averageLoadAdjustmentPercentageApplied, \
+    dutyCycleApplied, \
+    eventControl \
+  );
 
 /** @brief Command description for PublishCalendar
  *
  * Command: PublishCalendar
- * @param providerId INT32U
- * @param earliestStartTime UTC_TIME
- * @param issuerEventId INT32U
- * @param minIssuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param numberOfCalendars INT8U
- * @param startTime UTC_TIME
- * @param calendarType CalendarType
- * @param calendarType CalendarType
- * @param providerId INT32U
- * @param calendarTimeReference CalendarTimeReference
- * @param calendarName OCTET_STRING
- * @param numberOfSeasons INT8U
- * @param numberOfWeekProfiles INT8U
- * @param numberOfDayProfiles INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishCalendar(                                                                          \
-    providerId, earliestStartTime, issuerEventId, minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType,  \
-    calendarType, providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles, numberOfDayProfiles)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_CALENDAR_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, earliestStartTime, issuerEventId,    \
-                              minIssuerEventId, issuerCalendarId, numberOfCalendars, startTime, calendarType, calendarType,        \
-                              providerId, calendarTimeReference, calendarName, numberOfSeasons, numberOfWeekProfiles,              \
-                              numberOfDayProfiles);
+ * @param providerId INT32U 
+ * @param earliestStartTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param minIssuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param numberOfCalendars INT8U 
+ * @param startTime UTC_TIME 
+ * @param calendarType CalendarType 
+ * @param calendarType CalendarType 
+ * @param providerId INT32U 
+ * @param calendarTimeReference CalendarTimeReference 
+ * @param calendarName OCTET_STRING 
+ * @param numberOfSeasons INT8U 
+ * @param numberOfWeekProfiles INT8U 
+ * @param numberOfDayProfiles INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishCalendar( \
+  providerId, \
+  earliestStartTime, \
+  issuerEventId, \
+  minIssuerEventId, \
+  issuerCalendarId, \
+  numberOfCalendars, \
+  startTime, \
+  calendarType, \
+  calendarType, \
+  providerId, \
+  calendarTimeReference, \
+  calendarName, \
+  numberOfSeasons, \
+  numberOfWeekProfiles, \
+  numberOfDayProfiles \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_CALENDAR_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    earliestStartTime, \
+    issuerEventId, \
+    minIssuerEventId, \
+    issuerCalendarId, \
+    numberOfCalendars, \
+    startTime, \
+    calendarType, \
+    calendarType, \
+    providerId, \
+    calendarTimeReference, \
+    calendarName, \
+    numberOfSeasons, \
+    numberOfWeekProfiles, \
+    numberOfDayProfiles \
+  );
 
 /** @brief Command description for PublishDayProfile
  *
  * Command: PublishDayProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startDayId INT8U
- * @param dayId INT8U
- * @param numberOfDays INT8U
- * @param totalNumberOfScheduleEntries INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
- * @param calendarType CalendarType
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startDayId INT8U 
+ * @param dayId INT8U 
+ * @param numberOfDays INT8U 
+ * @param totalNumberOfScheduleEntries INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
+ * @param calendarType CalendarType 
  * @param dayScheduleEntries ScheduleEntry []
  * @param dayScheduleEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishDayProfile(                                                                        \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays,                    \
-    totalNumberOfScheduleEntries, commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen)    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, "uuuuuuuuuuuub", providerId, providerId, issuerEventId,          \
-                              issuerCalendarId, issuerCalendarId, startDayId, dayId, numberOfDays, totalNumberOfScheduleEntries,   \
-                              commandIndex, totalNumberOfCommands, calendarType, dayScheduleEntries, dayScheduleEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishDayProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startDayId, \
+  dayId, \
+  numberOfDays, \
+  totalNumberOfScheduleEntries, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  calendarType, \
+  dayScheduleEntries, dayScheduleEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_DAY_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startDayId, \
+    dayId, \
+    numberOfDays, \
+    totalNumberOfScheduleEntries, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    calendarType, \
+    dayScheduleEntries, dayScheduleEntriesLen \
+  );
 
 /** @brief Command description for PublishWeekProfile
  *
  * Command: PublishWeekProfile
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param startWeekId INT8U
- * @param weekId INT8U
- * @param numberOfWeeks INT8U
- * @param dayIdRefMonday INT8U
- * @param dayIdRefTuesday INT8U
- * @param dayIdRefWednesday INT8U
- * @param dayIdRefThursday INT8U
- * @param dayIdRefFriday INT8U
- * @param dayIdRefSaturday INT8U
- * @param dayIdRefSunday INT8U
- */
-#define emberAfFillCommandCalendarClusterPublishWeekProfile(                                                                       \
-    providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday, \
-    dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday, dayIdRefSunday)                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, "uuuuuuuuuuuuuuu", providerId, providerId, issuerEventId,       \
-                              issuerCalendarId, issuerCalendarId, startWeekId, weekId, numberOfWeeks, dayIdRefMonday,              \
-                              dayIdRefTuesday, dayIdRefWednesday, dayIdRefThursday, dayIdRefFriday, dayIdRefSaturday,              \
-                              dayIdRefSunday);
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param startWeekId INT8U 
+ * @param weekId INT8U 
+ * @param numberOfWeeks INT8U 
+ * @param dayIdRefMonday INT8U 
+ * @param dayIdRefTuesday INT8U 
+ * @param dayIdRefWednesday INT8U 
+ * @param dayIdRefThursday INT8U 
+ * @param dayIdRefFriday INT8U 
+ * @param dayIdRefSaturday INT8U 
+ * @param dayIdRefSunday INT8U 
+ */
+#define emberAfFillCommandCalendarClusterPublishWeekProfile( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  startWeekId, \
+  weekId, \
+  numberOfWeeks, \
+  dayIdRefMonday, \
+  dayIdRefTuesday, \
+  dayIdRefWednesday, \
+  dayIdRefThursday, \
+  dayIdRefFriday, \
+  dayIdRefSaturday, \
+  dayIdRefSunday \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_WEEK_PROFILE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    startWeekId, \
+    weekId, \
+    numberOfWeeks, \
+    dayIdRefMonday, \
+    dayIdRefTuesday, \
+    dayIdRefWednesday, \
+    dayIdRefThursday, \
+    dayIdRefFriday, \
+    dayIdRefSaturday, \
+    dayIdRefSunday \
+  );
 
 /** @brief Command description for PublishSeasons
  *
  * Command: PublishSeasons
- * @param providerId INT32U
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param issuerCalendarId INT32U
- * @param issuerCalendarId INT32U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param seasonEntries SeasonEntry []
  * @param seasonEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSeasons(providerId, providerId, issuerEventId, issuerCalendarId, issuerCalendarId, \
-                                                        commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SEASONS_COMMAND_ID, "uuuuuuub", providerId, providerId, issuerEventId, issuerCalendarId, \
-                              issuerCalendarId, commandIndex, totalNumberOfCommands, seasonEntries, seasonEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSeasons( \
+  providerId, \
+  providerId, \
+  issuerEventId, \
+  issuerCalendarId, \
+  issuerCalendarId, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  seasonEntries, seasonEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SEASONS_COMMAND_ID, \
+    "uuuuuuub", \
+    providerId, \
+    providerId, \
+    issuerEventId, \
+    issuerCalendarId, \
+    issuerCalendarId, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    seasonEntries, seasonEntriesLen \
+  );
 
 /** @brief Command description for PublishSpecialDays
  *
  * Command: PublishSpecialDays
- * @param providerId INT32U
- * @param startTime UTC_TIME
- * @param issuerEventId INT32U
- * @param numberOfEvents INT8U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- * @param startTime UTC_TIME
- * @param providerId INT32U
- * @param calendarType CalendarType
- * @param issuerCalendarId INT32U
- * @param totalNumberOfSpecialDays INT8U
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param providerId INT32U 
+ * @param startTime UTC_TIME 
+ * @param issuerEventId INT32U 
+ * @param numberOfEvents INT8U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ * @param startTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param calendarType CalendarType 
+ * @param issuerCalendarId INT32U 
+ * @param totalNumberOfSpecialDays INT8U 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param specialDayEntries SpecialDay []
  * @param specialDayEntriesLen int
  */
-#define emberAfFillCommandCalendarClusterPublishSpecialDays(                                                                       \
-    providerId, startTime, issuerEventId, numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,     \
-    issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries, specialDayEntriesLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, "uuuuuuuuuuuuub", providerId, startTime, issuerEventId,         \
-                              numberOfEvents, issuerCalendarId, calendarType, startTime, providerId, calendarType,                 \
-                              issuerCalendarId, totalNumberOfSpecialDays, commandIndex, totalNumberOfCommands, specialDayEntries,  \
-                              specialDayEntriesLen);
+#define emberAfFillCommandCalendarClusterPublishSpecialDays( \
+  providerId, \
+  startTime, \
+  issuerEventId, \
+  numberOfEvents, \
+  issuerCalendarId, \
+  calendarType, \
+  startTime, \
+  providerId, \
+  calendarType, \
+  issuerCalendarId, \
+  totalNumberOfSpecialDays, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  specialDayEntries, specialDayEntriesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUBLISH_SPECIAL_DAYS_COMMAND_ID, \
+    "uuuuuuuuuuuuub", \
+    providerId, \
+    startTime, \
+    issuerEventId, \
+    numberOfEvents, \
+    issuerCalendarId, \
+    calendarType, \
+    startTime, \
+    providerId, \
+    calendarType, \
+    issuerCalendarId, \
+    totalNumberOfSpecialDays, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    specialDayEntries, specialDayEntriesLen \
+  );
 
 /** @brief Command description for GetCalendarCancellation
  *
  * Command: GetCalendarCancellation
- * @param providerId INT32U
- * @param issuerCalendarId INT32U
- * @param calendarType CalendarType
- */
-#define emberAfFillCommandCalendarClusterGetCalendarCancellation(providerId, issuerCalendarId, calendarType)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, "uuu", providerId, issuerCalendarId, calendarType);
+ * @param providerId INT32U 
+ * @param issuerCalendarId INT32U 
+ * @param calendarType CalendarType 
+ */
+#define emberAfFillCommandCalendarClusterGetCalendarCancellation( \
+  providerId, \
+  issuerCalendarId, \
+  calendarType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CALENDAR_CANCELLATION_COMMAND_ID, \
+    "uuu", \
+    providerId, \
+    issuerCalendarId, \
+    calendarType \
+  );
 
 /** @brief Command description for GetChangeOfTenancy
  *
  * Command: GetChangeOfTenancy
- * @param providerId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param implementationDateTime UTC_TIME
- * @param proposedTenancyChangeControl ProposedChangeControl
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfTenancy(providerId, issuerEventId, tariffType, implementationDateTime,                             \
-                                        proposedTenancyChangeControl)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, "uuuuu", providerId, issuerEventId, tariffType,            \
-                                  implementationDateTime, proposedTenancyChangeControl);
+ * @param providerId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param implementationDateTime UTC_TIME 
+ * @param proposedTenancyChangeControl ProposedChangeControl 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfTenancy( \
+  providerId, \
+  issuerEventId, \
+  tariffType, \
+  implementationDateTime, \
+  proposedTenancyChangeControl \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_TENANCY_COMMAND_ID, \
+    "uuuuu", \
+    providerId, \
+    issuerEventId, \
+    tariffType, \
+    implementationDateTime, \
+    proposedTenancyChangeControl \
+  );
 
 /** @brief Command description for GetChangeOfSupplier
  *
  * Command: GetChangeOfSupplier
- * @param currentProviderId INT32U
- * @param issuerEventId INT32U
- * @param tariffType TariffType
- * @param proposedProviderId INT32U
- * @param providerChangeImplementationTime UTC_TIME
- * @param providerChangeControl ProposedChangeControl
- * @param proposedProviderName OCTET_STRING
- * @param proposedProviderContactDetails OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetChangeOfSupplier(currentProviderId, issuerEventId, tariffType, proposedProviderId,                         \
-                                         providerChangeImplementationTime, providerChangeControl, proposedProviderName,            \
-                                         proposedProviderContactDetails)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, "uuuuuuuu", currentProviderId, issuerEventId, tariffType, \
-                                  proposedProviderId, providerChangeImplementationTime, providerChangeControl,                     \
-                                  proposedProviderName, proposedProviderContactDetails);
+ * @param currentProviderId INT32U 
+ * @param issuerEventId INT32U 
+ * @param tariffType TariffType 
+ * @param proposedProviderId INT32U 
+ * @param providerChangeImplementationTime UTC_TIME 
+ * @param providerChangeControl ProposedChangeControl 
+ * @param proposedProviderName OCTET_STRING 
+ * @param proposedProviderContactDetails OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetChangeOfSupplier( \
+  currentProviderId, \
+  issuerEventId, \
+  tariffType, \
+  proposedProviderId, \
+  providerChangeImplementationTime, \
+  providerChangeControl, \
+  proposedProviderName, \
+  proposedProviderContactDetails \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CHANGE_OF_SUPPLIER_COMMAND_ID, \
+    "uuuuuuuu", \
+    currentProviderId, \
+    issuerEventId, \
+    tariffType, \
+    proposedProviderId, \
+    providerChangeImplementationTime, \
+    providerChangeControl, \
+    proposedProviderName, \
+    proposedProviderContactDetails \
+  );
 
 /** @brief Command description for RequestNewPassword
  *
  * Command: RequestNewPassword
- * @param passwordType PasswordType
- * @param issuerEventId INT32U
- * @param implementationDateTime UTC_TIME
- * @param durationInMinutes INT16U
- * @param passwordType PasswordType
- * @param password OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterRequestNewPassword(passwordType, issuerEventId, implementationDateTime, durationInMinutes, passwordType,      \
-                                        password)                                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, "uuuuuu", passwordType, issuerEventId,                      \
-                                  implementationDateTime, durationInMinutes, passwordType, password);
+ * @param passwordType PasswordType 
+ * @param issuerEventId INT32U 
+ * @param implementationDateTime UTC_TIME 
+ * @param durationInMinutes INT16U 
+ * @param passwordType PasswordType 
+ * @param password OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterRequestNewPassword( \
+  passwordType, \
+  issuerEventId, \
+  implementationDateTime, \
+  durationInMinutes, \
+  passwordType, \
+  password \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_PASSWORD_COMMAND_ID, \
+    "uuuuuu", \
+    passwordType, \
+    issuerEventId, \
+    implementationDateTime, \
+    durationInMinutes, \
+    passwordType, \
+    password \
+  );
 
 /** @brief Command description for GetSiteId
  *
  * Command: GetSiteId
- * @param issuerEventId INT32U
- * @param siteIdTime UTC_TIME
- * @param providerId INT32U
- * @param siteId OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetSiteId(issuerEventId, siteIdTime, providerId, siteId)                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SITE_ID_COMMAND_ID, "uuuu", issuerEventId, siteIdTime, providerId, siteId);
+ * @param issuerEventId INT32U 
+ * @param siteIdTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param siteId OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetSiteId( \
+  issuerEventId, \
+  siteIdTime, \
+  providerId, \
+  siteId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SITE_ID_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    siteIdTime, \
+    providerId, \
+    siteId \
+  );
 
 /** @brief Command description for ReportEventConfiguration
  *
  * Command: ReportEventConfiguration
- * @param commandIndex INT8U
- * @param issuerEventId INT32U
- * @param totalCommands INT8U
- * @param startDateTime UTC_TIME
+ * @param commandIndex INT8U 
+ * @param issuerEventId INT32U 
+ * @param totalCommands INT8U 
+ * @param startDateTime UTC_TIME 
  * @param eventConfigurationPayload EventConfigurationPayload []
  * @param eventConfigurationPayloadLen int
- * @param eventConfiguration EventConfiguration
- * @param configurationControl EventConfigurationControl
+ * @param eventConfiguration EventConfiguration 
+ * @param configurationControl EventConfigurationControl 
  * @param eventConfigurationPayload INT8U []
  * @param eventConfigurationPayloadLen int
  */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterReportEventConfiguration(commandIndex, issuerEventId, totalCommands, startDateTime,                           \
-                                              eventConfigurationPayload, eventConfigurationPayloadLen, eventConfiguration,         \
-                                              configurationControl, eventConfigurationPayload, eventConfigurationPayloadLen)       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, "uuuubuub", commandIndex, issuerEventId,              \
-                                  totalCommands, startDateTime, eventConfigurationPayload, eventConfigurationPayloadLen,           \
-                                  eventConfiguration, configurationControl, eventConfigurationPayload,                             \
-                                  eventConfigurationPayloadLen);
+#define emberAfFillCommandDevice ManagementClusterReportEventConfiguration( \
+  commandIndex, \
+  issuerEventId, \
+  totalCommands, \
+  startDateTime, \
+  eventConfigurationPayload, eventConfigurationPayloadLen, \
+  eventConfiguration, \
+  configurationControl, \
+  eventConfigurationPayload, eventConfigurationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REPORT_EVENT_CONFIGURATION_COMMAND_ID, \
+    "uuuubuub", \
+    commandIndex, \
+    issuerEventId, \
+    totalCommands, \
+    startDateTime, \
+    eventConfigurationPayload, eventConfigurationPayloadLen, \
+    eventConfiguration, \
+    configurationControl, \
+    eventConfigurationPayload, eventConfigurationPayloadLen \
+  );
 
 /** @brief Command description for GetCIN
  *
  * Command: GetCIN
- * @param eventId INT16U
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterGetCIN(eventId) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_GET_CIN_COMMAND_ID, "u", eventId);
+ * @param eventId INT16U 
+ */
+#define emberAfFillCommandDevice ManagementClusterGetCIN( \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_CIN_COMMAND_ID, \
+    "u", \
+    eventId \
+  );
 
 /** @brief Command description for UpdateCIN
  *
  * Command: UpdateCIN
- * @param issuerEventId INT32U
- * @param implementationTime UTC_TIME
- * @param providerId INT32U
- * @param customerIdNumber OCTET_STRING
- */
-#define emberAfFillCommandDevice                                                                                                   \
-    ManagementClusterUpdateCIN(issuerEventId, implementationTime, providerId, customerIdNumber) emberAfFillExternalBuffer(         \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_UPDATE_CIN_COMMAND_ID, "uuuu", issuerEventId, implementationTime, providerId, customerIdNumber);
+ * @param issuerEventId INT32U 
+ * @param implementationTime UTC_TIME 
+ * @param providerId INT32U 
+ * @param customerIdNumber OCTET_STRING 
+ */
+#define emberAfFillCommandDevice ManagementClusterUpdateCIN( \
+  issuerEventId, \
+  implementationTime, \
+  providerId, \
+  customerIdNumber \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_CIN_COMMAND_ID, \
+    "uuuu", \
+    issuerEventId, \
+    implementationTime, \
+    providerId, \
+    customerIdNumber \
+  );
 
 /** @brief Command description for GetEventLog
  *
  * Command: GetEventLog
- * @param eventControlLogId EventControlLogId
- * @param logId EventLogId
- * @param eventId INT16U
- * @param eventId INT16U
- * @param startTime UTC_TIME
- * @param eventTime UTC_TIME
- * @param endTime UTC_TIME
- * @param eventControl EventActionControl
- * @param numberOfEvents INT8U
- * @param eventData OCTET_STRING
- * @param eventOffset INT16U
- */
-#define emberAfFillCommandEventsClusterGetEventLog(eventControlLogId, logId, eventId, eventId, startTime, eventTime, endTime,      \
-                                                   eventControl, numberOfEvents, eventData, eventOffset)                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_EVENT_LOG_COMMAND_ID, "uuuuuuuuuuu", eventControlLogId, logId, eventId, eventId, startTime,  \
-                              eventTime, endTime, eventControl, numberOfEvents, eventData, eventOffset);
+ * @param eventControlLogId EventControlLogId 
+ * @param logId EventLogId 
+ * @param eventId INT16U 
+ * @param eventId INT16U 
+ * @param startTime UTC_TIME 
+ * @param eventTime UTC_TIME 
+ * @param endTime UTC_TIME 
+ * @param eventControl EventActionControl 
+ * @param numberOfEvents INT8U 
+ * @param eventData OCTET_STRING 
+ * @param eventOffset INT16U 
+ */
+#define emberAfFillCommandEventsClusterGetEventLog( \
+  eventControlLogId, \
+  logId, \
+  eventId, \
+  eventId, \
+  startTime, \
+  eventTime, \
+  endTime, \
+  eventControl, \
+  numberOfEvents, \
+  eventData, \
+  eventOffset \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_EVENT_LOG_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    eventControlLogId, \
+    logId, \
+    eventId, \
+    eventId, \
+    startTime, \
+    eventTime, \
+    endTime, \
+    eventControl, \
+    numberOfEvents, \
+    eventData, \
+    eventOffset \
+  );
 
 /** @brief Command description for ClearEventLogRequest
  *
  * Command: ClearEventLogRequest
- * @param logId EventLogId
- * @param totalNumberOfEvents INT16U
- * @param commandIndex INT8U
- * @param totalCommands INT8U
- * @param logPayloadControl NumberOfEventsLogPayloadControl
+ * @param logId EventLogId 
+ * @param totalNumberOfEvents INT16U 
+ * @param commandIndex INT8U 
+ * @param totalCommands INT8U 
+ * @param logPayloadControl NumberOfEventsLogPayloadControl 
  * @param logPayload EventLogPayload []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandEventsClusterClearEventLogRequest(logId, totalNumberOfEvents, commandIndex, totalCommands,               \
-                                                            logPayloadControl, logPayload, logPayloadLen)                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, "uuuuub", logId, totalNumberOfEvents, commandIndex,          \
-                              totalCommands, logPayloadControl, logPayload, logPayloadLen);
+#define emberAfFillCommandEventsClusterClearEventLogRequest( \
+  logId, \
+  totalNumberOfEvents, \
+  commandIndex, \
+  totalCommands, \
+  logPayloadControl, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_REQUEST_COMMAND_ID, \
+    "uuuuub", \
+    logId, \
+    totalNumberOfEvents, \
+    commandIndex, \
+    totalCommands, \
+    logPayloadControl, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for ClearEventLogResponse
  *
  * Command: ClearEventLogResponse
- * @param clearedEventsLogs ClearedEventsLogs
- */
-#define emberAfFillCommandEventsClusterClearEventLogResponse(clearedEventsLogs)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, "u", clearedEventsLogs);
+ * @param clearedEventsLogs ClearedEventsLogs 
+ */
+#define emberAfFillCommandEventsClusterClearEventLogResponse( \
+  clearedEventsLogs \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_EVENT_LOG_RESPONSE_COMMAND_ID, \
+    "u", \
+    clearedEventsLogs \
+  );
 
 /** @brief Command description for PairingResponse
  *
  * Command: PairingResponse
- * @param pairingInformationVersion INT32U
- * @param localPairingInformationVersion INT32U
- * @param totalNumberOfDevices INT8U
- * @param eui64OfRequestingDevice IEEE_ADDRESS
- * @param commandIndex INT8U
- * @param totalNumberOfCommands INT8U
+ * @param pairingInformationVersion INT32U 
+ * @param localPairingInformationVersion INT32U 
+ * @param totalNumberOfDevices INT8U 
+ * @param eui64OfRequestingDevice IEEE_ADDRESS 
+ * @param commandIndex INT8U 
+ * @param totalNumberOfCommands INT8U 
  * @param eui64s IEEE_ADDRESS []
  * @param eui64sLen int
  */
-#define emberAfFillCommandMDU                                                                                                      \
-    PairingClusterPairingResponse(pairingInformationVersion, localPairingInformationVersion, totalNumberOfDevices,                 \
-                                  eui64OfRequestingDevice, commandIndex, totalNumberOfCommands, eui64s, eui64sLen)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PAIRING_RESPONSE_COMMAND_ID, "uuuuuub", pairingInformationVersion,                           \
-                                  localPairingInformationVersion, totalNumberOfDevices, eui64OfRequestingDevice, commandIndex,     \
-                                  totalNumberOfCommands, eui64s, eui64sLen);
+#define emberAfFillCommandMDU PairingClusterPairingResponse( \
+  pairingInformationVersion, \
+  localPairingInformationVersion, \
+  totalNumberOfDevices, \
+  eui64OfRequestingDevice, \
+  commandIndex, \
+  totalNumberOfCommands, \
+  eui64s, eui64sLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAIRING_RESPONSE_COMMAND_ID, \
+    "uuuuuub", \
+    pairingInformationVersion, \
+    localPairingInformationVersion, \
+    totalNumberOfDevices, \
+    eui64OfRequestingDevice, \
+    commandIndex, \
+    totalNumberOfCommands, \
+    eui64s, eui64sLen \
+  );
 
 /** @brief Command description for GetSuspendZclMessagesStatus
  *
  * Command: GetSuspendZclMessagesStatus
- * @param period INT8U
- */
-#define emberAfFillCommandSub                                                                                                      \
-    -GHzClusterGetSuspendZclMessagesStatus(period)                                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, "u", period);
+ * @param period INT8U 
+ */
+#define emberAfFillCommandSub-GHzClusterGetSuspendZclMessagesStatus( \
+  period \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_SUSPEND_ZCL_MESSAGES_STATUS_COMMAND_ID, \
+    "u", \
+    period \
+  );
 
 /** @brief Command description for InitiateKeyEstablishmentRequest
  *
  * Command: InitiateKeyEstablishmentRequest
- * @param keyEstablishmentSuite BITMAP16
- * @param requestedKeyEstablishmentSuite BITMAP16
- * @param ephemeralDataGenerateTime INT8U
- * @param ephemeralDataGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param confirmKeyGenerateTime INT8U
- * @param identity Identity
- * @param identity Identity
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterInitiateKeyEstablishmentRequest(keyEstablishmentSuite, requestedKeyEstablishmentSuite,                     \
-                                                        ephemeralDataGenerateTime, ephemeralDataGenerateTime,                      \
-                                                        confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity)        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuuu", keyEstablishmentSuite,            \
-                                  requestedKeyEstablishmentSuite, ephemeralDataGenerateTime, ephemeralDataGenerateTime,            \
-                                  confirmKeyGenerateTime, confirmKeyGenerateTime, identity, identity);
+ * @param keyEstablishmentSuite BITMAP16 
+ * @param requestedKeyEstablishmentSuite BITMAP16 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param ephemeralDataGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param confirmKeyGenerateTime INT8U 
+ * @param identity Identity 
+ * @param identity Identity 
+ */
+#define emberAfFillCommandKey EstablishmentClusterInitiateKeyEstablishmentRequest( \
+  keyEstablishmentSuite, \
+  requestedKeyEstablishmentSuite, \
+  ephemeralDataGenerateTime, \
+  ephemeralDataGenerateTime, \
+  confirmKeyGenerateTime, \
+  confirmKeyGenerateTime, \
+  identity, \
+  identity \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_INITIATE_KEY_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuuu", \
+    keyEstablishmentSuite, \
+    requestedKeyEstablishmentSuite, \
+    ephemeralDataGenerateTime, \
+    ephemeralDataGenerateTime, \
+    confirmKeyGenerateTime, \
+    confirmKeyGenerateTime, \
+    identity, \
+    identity \
+  );
 
 /** @brief Command description for EphemeralDataRequest
  *
  * Command: EphemeralDataRequest
- * @param ephemeralData EphemeralData
- * @param ephemeralData EphemeralData
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterEphemeralDataRequest(ephemeralData, ephemeralData)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, "uu", ephemeralData, ephemeralData);
+ * @param ephemeralData EphemeralData 
+ * @param ephemeralData EphemeralData 
+ */
+#define emberAfFillCommandKey EstablishmentClusterEphemeralDataRequest( \
+  ephemeralData, \
+  ephemeralData \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EPHEMERAL_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    ephemeralData, \
+    ephemeralData \
+  );
 
 /** @brief Command description for ConfirmKeyDataRequest
  *
  * Command: ConfirmKeyDataRequest
- * @param secureMessageAuthenticationCode Smac
- * @param secureMessageAuthenticationCode Smac
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterConfirmKeyDataRequest(secureMessageAuthenticationCode, secureMessageAuthenticationCode)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, "uu", secureMessageAuthenticationCode,                  \
-                                  secureMessageAuthenticationCode);
+ * @param secureMessageAuthenticationCode Smac 
+ * @param secureMessageAuthenticationCode Smac 
+ */
+#define emberAfFillCommandKey EstablishmentClusterConfirmKeyDataRequest( \
+  secureMessageAuthenticationCode, \
+  secureMessageAuthenticationCode \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIRM_KEY_DATA_REQUEST_COMMAND_ID, \
+    "uu", \
+    secureMessageAuthenticationCode, \
+    secureMessageAuthenticationCode \
+  );
 
 /** @brief Command description for TerminateKeyEstablishment
  *
  * Command: TerminateKeyEstablishment
- * @param statusCode AmiKeyEstablishmentStatus
- * @param waitTime INT8U
- * @param keyEstablishmentSuite BITMAP16
- */
-#define emberAfFillCommandKey                                                                                                      \
-    EstablishmentClusterTerminateKeyEstablishment(statusCode, waitTime, keyEstablishmentSuite)                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, "uuu", statusCode, waitTime, keyEstablishmentSuite);
+ * @param statusCode AmiKeyEstablishmentStatus 
+ * @param waitTime INT8U 
+ * @param keyEstablishmentSuite BITMAP16 
+ */
+#define emberAfFillCommandKey EstablishmentClusterTerminateKeyEstablishment( \
+  statusCode, \
+  waitTime, \
+  keyEstablishmentSuite \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TERMINATE_KEY_ESTABLISHMENT_COMMAND_ID, \
+    "uuu", \
+    statusCode, \
+    waitTime, \
+    keyEstablishmentSuite \
+  );
 
 /** @brief Command description for RequestInformation
  *
  * Command: RequestInformation
- * @param inquiryId ENUM8
- * @param number INT8U
- * @param dataTypeId BITMAP8
+ * @param inquiryId ENUM8 
+ * @param number INT8U 
+ * @param dataTypeId BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  * @param requestInformationPayload INT8U []
  * @param requestInformationPayloadLen int
  */
-#define emberAfFillCommandInformationClusterRequestInformation(inquiryId, number, dataTypeId, buffer, bufferLen,                   \
-                                                               requestInformationPayload, requestInformationPayloadLen)            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_REQUEST_INFORMATION_COMMAND_ID, "uuubb", inquiryId, number, dataTypeId, buffer, bufferLen,       \
-                              requestInformationPayload, requestInformationPayloadLen);
+#define emberAfFillCommandInformationClusterRequestInformation( \
+  inquiryId, \
+  number, \
+  dataTypeId, \
+  buffer, bufferLen, \
+  requestInformationPayload, requestInformationPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_INFORMATION_COMMAND_ID, \
+    "uuubb", \
+    inquiryId, \
+    number, \
+    dataTypeId, \
+    buffer, bufferLen, \
+    requestInformationPayload, requestInformationPayloadLen \
+  );
 
 /** @brief Command description for PushInformationResponse
  *
@@ -5170,1632 +8970,2705 @@
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterPushInformationResponse(notificationList, notificationListLen, contents, contentsLen)  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, "bb", notificationList, notificationListLen, contents,     \
-                              contentsLen);
+#define emberAfFillCommandInformationClusterPushInformationResponse( \
+  notificationList, notificationListLen, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PUSH_INFORMATION_RESPONSE_COMMAND_ID, \
+    "bb", \
+    notificationList, notificationListLen, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for SendPreference
  *
  * Command: SendPreference
- * @param preferenceType INT16U
+ * @param preferenceType INT16U 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterSendPreference(preferenceType, statusFeedbackList, statusFeedbackListLen,              \
-                                                           preferencePayload, preferencePayloadLen)                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEND_PREFERENCE_COMMAND_ID, "ubb", preferenceType, statusFeedbackList, statusFeedbackListLen,    \
-                              preferencePayload, preferencePayloadLen);
+#define emberAfFillCommandInformationClusterSendPreference( \
+  preferenceType, \
+  statusFeedbackList, statusFeedbackListLen, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEND_PREFERENCE_COMMAND_ID, \
+    "ubb", \
+    preferenceType, \
+    statusFeedbackList, statusFeedbackListLen, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for ServerRequestPreference
  *
  * Command: ServerRequestPreference
- * @param statusFeedback Status
- * @param preferenceType INT16U
+ * @param statusFeedback Status 
+ * @param preferenceType INT16U 
  * @param preferencePayload INT8U []
  * @param preferencePayloadLen int
  */
-#define emberAfFillCommandInformationClusterServerRequestPreference(statusFeedback, preferenceType, preferencePayload,             \
-                                                                    preferencePayloadLen)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, "uub", statusFeedback, preferenceType, preferencePayload,  \
-                              preferencePayloadLen);
+#define emberAfFillCommandInformationClusterServerRequestPreference( \
+  statusFeedback, \
+  preferenceType, \
+  preferencePayload, preferencePayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SERVER_REQUEST_PREFERENCE_COMMAND_ID, \
+    "uub", \
+    statusFeedback, \
+    preferenceType, \
+    preferencePayload, preferencePayloadLen \
+  );
 
 /** @brief Command description for Update
  *
  * Command: Update
- * @param accessControl ENUM8
+ * @param accessControl ENUM8 
  * @param statusFeedbackList Status []
  * @param statusFeedbackListLen int
- * @param option BITMAP8
+ * @param option BITMAP8 
  * @param contents INT8U []
  * @param contentsLen int
  */
-#define emberAfFillCommandInformationClusterUpdate(accessControl, statusFeedbackList, statusFeedbackListLen, option, contents,     \
-                                                   contentsLen)                                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UPDATE_COMMAND_ID, "ubub", accessControl, statusFeedbackList, statusFeedbackListLen, option,     \
-                              contents, contentsLen);
+#define emberAfFillCommandInformationClusterUpdate( \
+  accessControl, \
+  statusFeedbackList, statusFeedbackListLen, \
+  option, \
+  contents, contentsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UPDATE_COMMAND_ID, \
+    "ubub", \
+    accessControl, \
+    statusFeedbackList, statusFeedbackListLen, \
+    option, \
+    contents, contentsLen \
+  );
 
 /** @brief Command description for Delete
  *
  * Command: Delete
- * @param deletionOptions BITMAP8
+ * @param deletionOptions BITMAP8 
  * @param notificationList Notification []
  * @param notificationListLen int
  * @param contentIds INT16U []
  * @param contentIdsLen int
  */
-#define emberAfFillCommandInformationClusterDelete(deletionOptions, notificationList, notificationListLen, contentIds,             \
-                                                   contentIdsLen)                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DELETE_COMMAND_ID, "ubb", deletionOptions, notificationList, notificationListLen, contentIds,    \
-                              contentIdsLen);
+#define emberAfFillCommandInformationClusterDelete( \
+  deletionOptions, \
+  notificationList, notificationListLen, \
+  contentIds, contentIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DELETE_COMMAND_ID, \
+    "ubb", \
+    deletionOptions, \
+    notificationList, notificationListLen, \
+    contentIds, contentIdsLen \
+  );
 
 /** @brief Command description for ConfigureNodeDescription
  *
  * Command: ConfigureNodeDescription
- * @param description CHAR_STRING
+ * @param description CHAR_STRING 
  * @param notificationList Notification []
  * @param notificationListLen int
  */
-#define emberAfFillCommandInformationClusterConfigureNodeDescription(description, notificationList, notificationListLen)           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, "ub", description, notificationList,                      \
-                              notificationListLen);
+#define emberAfFillCommandInformationClusterConfigureNodeDescription( \
+  description, \
+  notificationList, notificationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_NODE_DESCRIPTION_COMMAND_ID, \
+    "ub", \
+    description, \
+    notificationList, notificationListLen \
+  );
 
 /** @brief Command description for ConfigureDeliveryEnable
  *
  * Command: ConfigureDeliveryEnable
- * @param enable BOOLEAN
- */
-#define emberAfFillCommandInformationClusterConfigureDeliveryEnable(enable)                                                        \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, "u", enable);
+ * @param enable BOOLEAN 
+ */
+#define emberAfFillCommandInformationClusterConfigureDeliveryEnable( \
+  enable \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_DELIVERY_ENABLE_COMMAND_ID, \
+    "u", \
+    enable \
+  );
 
 /** @brief Command description for ConfigurePushInformationTimer
  *
  * Command: ConfigurePushInformationTimer
- * @param timer INT32U
- */
-#define emberAfFillCommandInformationClusterConfigurePushInformationTimer(timer)                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, "u", timer);
+ * @param timer INT32U 
+ */
+#define emberAfFillCommandInformationClusterConfigurePushInformationTimer( \
+  timer \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_PUSH_INFORMATION_TIMER_COMMAND_ID, \
+    "u", \
+    timer \
+  );
 
 /** @brief Command description for ConfigureSetRootId
  *
  * Command: ConfigureSetRootId
- * @param rootId INT16U
- */
-#define emberAfFillCommandInformationClusterConfigureSetRootId(rootId)                                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, "u", rootId);
+ * @param rootId INT16U 
+ */
+#define emberAfFillCommandInformationClusterConfigureSetRootId( \
+  rootId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONFIGURE_SET_ROOT_ID_COMMAND_ID, \
+    "u", \
+    rootId \
+  );
 
 /** @brief Command description for ReadFileRequest
  *
  * Command: ReadFileRequest
- * @param fileIndex INT16U
- * @param writeOptions BITMAP8
+ * @param fileIndex INT16U 
+ * @param writeOptions BITMAP8 
  * @param fileStartPositionAndRequestedOctetCount INT8U []
  * @param fileStartPositionAndRequestedOctetCountLen int
  * @param fileSize INT8U []
  * @param fileSizeLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadFileRequest(fileIndex, writeOptions, fileStartPositionAndRequestedOctetCount,                                \
-                                  fileStartPositionAndRequestedOctetCountLen, fileSize, fileSizeLen)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_FILE_REQUEST_COMMAND_ID, "uubb", fileIndex, writeOptions,                               \
-                                  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, fileSize,   \
-                                  fileSizeLen);
+#define emberAfFillCommandData SharingClusterReadFileRequest( \
+  fileIndex, \
+  writeOptions, \
+  fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+  fileSize, fileSizeLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_FILE_REQUEST_COMMAND_ID, \
+    "uubb", \
+    fileIndex, \
+    writeOptions, \
+    fileStartPositionAndRequestedOctetCount, fileStartPositionAndRequestedOctetCountLen, \
+    fileSize, fileSizeLen \
+  );
 
 /** @brief Command description for ReadRecordRequest
  *
  * Command: ReadRecordRequest
- * @param fileIndex INT16U
- * @param fileIndex INT16U
+ * @param fileIndex INT16U 
+ * @param fileIndex INT16U 
  * @param fileStartRecordAndRequestedRecordCount INT8U []
  * @param fileStartRecordAndRequestedRecordCountLen int
- * @param fileStartPosition INT32U
- * @param octetCount INT32U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterReadRecordRequest(fileIndex, fileIndex, fileStartRecordAndRequestedRecordCount,                                  \
-                                    fileStartRecordAndRequestedRecordCountLen, fileStartPosition, octetCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_READ_RECORD_REQUEST_COMMAND_ID, "uubuu", fileIndex, fileIndex,                               \
-                                  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen,               \
-                                  fileStartPosition, octetCount);
+ * @param fileStartPosition INT32U 
+ * @param octetCount INT32U 
+ */
+#define emberAfFillCommandData SharingClusterReadRecordRequest( \
+  fileIndex, \
+  fileIndex, \
+  fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+  fileStartPosition, \
+  octetCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_RECORD_REQUEST_COMMAND_ID, \
+    "uubuu", \
+    fileIndex, \
+    fileIndex, \
+    fileStartRecordAndRequestedRecordCount, fileStartRecordAndRequestedRecordCountLen, \
+    fileStartPosition, \
+    octetCount \
+  );
 
 /** @brief Command description for WriteFileResponse
  *
  * Command: WriteFileResponse
- * @param status ENUM8
- * @param fileIndex INT16U
+ * @param status ENUM8 
+ * @param fileIndex INT16U 
  * @param fileIndex INT8U []
  * @param fileIndexLen int
- * @param fileStartRecord INT16U
- * @param recordCount INT16U
- */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterWriteFileResponse(status, fileIndex, fileIndex, fileIndexLen, fileStartRecord, recordCount)                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, "uubuu", status, fileIndex, fileIndex, fileIndexLen,         \
-                                  fileStartRecord, recordCount);
+ * @param fileStartRecord INT16U 
+ * @param recordCount INT16U 
+ */
+#define emberAfFillCommandData SharingClusterWriteFileResponse( \
+  status, \
+  fileIndex, \
+  fileIndex, fileIndexLen, \
+  fileStartRecord, \
+  recordCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_WRITE_FILE_RESPONSE_COMMAND_ID, \
+    "uubuu", \
+    status, \
+    fileIndex, \
+    fileIndex, fileIndexLen, \
+    fileStartRecord, \
+    recordCount \
+  );
 
 /** @brief Command description for FileTransmission
  *
  * Command: FileTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterFileTransmission(transmitOptions, buffer, bufferLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_FILE_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterFileTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_FILE_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for RecordTransmission
  *
  * Command: RecordTransmission
- * @param transmitOptions BITMAP8
+ * @param transmitOptions BITMAP8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandData                                                                                                     \
-    SharingClusterRecordTransmission(transmitOptions, buffer, bufferLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RECORD_TRANSMISSION_COMMAND_ID, "ub", transmitOptions, buffer, bufferLen);
+#define emberAfFillCommandData SharingClusterRecordTransmission( \
+  transmitOptions, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RECORD_TRANSMISSION_COMMAND_ID, \
+    "ub", \
+    transmitOptions, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for SearchGame
  *
  * Command: SearchGame
- * @param specificGame ENUM8
- * @param gameId INT16U
- * @param gameId INT16U
- * @param gameMaster BOOLEAN
- * @param listOfGame CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterSearchGame(specificGame, gameId, gameId, gameMaster, listOfGame)                            \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_GAME_COMMAND_ID, "uuuuu", specificGame, gameId, gameId, gameMaster, listOfGame);
+ * @param specificGame ENUM8 
+ * @param gameId INT16U 
+ * @param gameId INT16U 
+ * @param gameMaster BOOLEAN 
+ * @param listOfGame CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterSearchGame( \
+  specificGame, \
+  gameId, \
+  gameId, \
+  gameMaster, \
+  listOfGame \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_GAME_COMMAND_ID, \
+    "uuuuu", \
+    specificGame, \
+    gameId, \
+    gameId, \
+    gameMaster, \
+    listOfGame \
+  );
 
 /** @brief Command description for JoinGame
  *
  * Command: JoinGame
- * @param gameId INT16U
- * @param commandId INT8U
- * @param joinAsMaster BOOLEAN
- * @param status BITMAP8
- * @param nameOfGame CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandGamingClusterJoinGame(gameId, commandId, joinAsMaster, status, nameOfGame, message)                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_GAME_COMMAND_ID, "uuuuuu", gameId, commandId, joinAsMaster, status, nameOfGame, message);
+ * @param gameId INT16U 
+ * @param commandId INT8U 
+ * @param joinAsMaster BOOLEAN 
+ * @param status BITMAP8 
+ * @param nameOfGame CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandGamingClusterJoinGame( \
+  gameId, \
+  commandId, \
+  joinAsMaster, \
+  status, \
+  nameOfGame, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_GAME_COMMAND_ID, \
+    "uuuuuu", \
+    gameId, \
+    commandId, \
+    joinAsMaster, \
+    status, \
+    nameOfGame, \
+    message \
+  );
 
 /** @brief Command description for StartGame
  *
  * Command: StartGame
  */
-#define emberAfFillCommandGamingClusterStartGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PauseGame
  *
  * Command: PauseGame
  */
-#define emberAfFillCommandGamingClusterPauseGame()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAUSE_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterPauseGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAUSE_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ResumeGame
  *
  * Command: ResumeGame
  */
-#define emberAfFillCommandGamingClusterResumeGame()                                                                                \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_RESUME_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterResumeGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESUME_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for QuitGame
  *
  * Command: QuitGame
  */
-#define emberAfFillCommandGamingClusterQuitGame()                                                                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_QUIT_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterQuitGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_QUIT_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EndGame
  *
  * Command: EndGame
  */
-#define emberAfFillCommandGamingClusterEndGame()                                                                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_END_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterEndGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_END_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for StartOver
  *
  * Command: StartOver
  */
-#define emberAfFillCommandGamingClusterStartOver()                                                                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_OVER_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterStartOver( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_OVER_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ActionControl
  *
  * Command: ActionControl
- * @param actions BITMAP32
- */
-#define emberAfFillCommandGamingClusterActionControl(actions)                                                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACTION_CONTROL_COMMAND_ID, "u", actions);
+ * @param actions BITMAP32 
+ */
+#define emberAfFillCommandGamingClusterActionControl( \
+  actions \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACTION_CONTROL_COMMAND_ID, \
+    "u", \
+    actions \
+  );
 
 /** @brief Command description for DownloadGame
  *
  * Command: DownloadGame
  */
-#define emberAfFillCommandGamingClusterDownloadGame()                                                                              \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_DOWNLOAD_GAME_COMMAND_ID, "", );
+#define emberAfFillCommandGamingClusterDownloadGame( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DOWNLOAD_GAME_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for PathCreation
  *
  * Command: PathCreation
- * @param originatorAddress DATA16
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathCreation(originatorAddress, originatorAddress, destinationAddress, destinationAddress, dataRate,        \
-                                    dataRate)                                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_CREATION_COMMAND_ID, "uuuuuu", originatorAddress, originatorAddress,                    \
-                                  destinationAddress, destinationAddress, dataRate, dataRate);
+ * @param originatorAddress DATA16 
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathCreation( \
+  originatorAddress, \
+  originatorAddress, \
+  destinationAddress, \
+  destinationAddress, \
+  dataRate, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_CREATION_COMMAND_ID, \
+    "uuuuuu", \
+    originatorAddress, \
+    originatorAddress, \
+    destinationAddress, \
+    destinationAddress, \
+    dataRate, \
+    dataRate \
+  );
 
 /** @brief Command description for DataRateNotification
  *
  * Command: DataRateNotification
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- * @param dataRate INT8U
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterDataRateNotification(originatorAddress, destinationAddress, dataRate)                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, "uuu", originatorAddress, destinationAddress, dataRate);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ * @param dataRate INT8U 
+ */
+#define emberAfFillCommandData Rate ControlClusterDataRateNotification( \
+  originatorAddress, \
+  destinationAddress, \
+  dataRate \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DATA_RATE_NOTIFICATION_COMMAND_ID, \
+    "uuu", \
+    originatorAddress, \
+    destinationAddress, \
+    dataRate \
+  );
 
 /** @brief Command description for PathDeletion
  *
  * Command: PathDeletion
- * @param originatorAddress DATA16
- * @param destinationAddress DATA16
- */
-#define emberAfFillCommandData                                                                                                     \
-    Rate ControlClusterPathDeletion(originatorAddress, destinationAddress)                                                         \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_PATH_DELETION_COMMAND_ID, "uu", originatorAddress, destinationAddress);
+ * @param originatorAddress DATA16 
+ * @param destinationAddress DATA16 
+ */
+#define emberAfFillCommandData Rate ControlClusterPathDeletion( \
+  originatorAddress, \
+  destinationAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PATH_DELETION_COMMAND_ID, \
+    "uu", \
+    originatorAddress, \
+    destinationAddress \
+  );
 
 /** @brief Command description for EstablishmentRequest
  *
  * Command: EstablishmentRequest
- * @param flag BITMAP8
- * @param ackNack ENUM8
- * @param codecType ENUM8
- * @param codecType ENUM8
- * @param sampFreq ENUM8
- * @param codecRate ENUM8
- * @param serviceType ENUM8
+ * @param flag BITMAP8 
+ * @param ackNack ENUM8 
+ * @param codecType ENUM8 
+ * @param codecType ENUM8 
+ * @param sampFreq ENUM8 
+ * @param codecRate ENUM8 
+ * @param serviceType ENUM8 
  * @param buffer INT8U []
  * @param bufferLen int
  */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterEstablishmentRequest(flag, ackNack, codecType, codecType, sampFreq, codecRate, serviceType, buffer,          \
-                                           bufferLen)                                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, "uuuuuuub", flag, ackNack, codecType, codecType, sampFreq, \
-                                  codecRate, serviceType, buffer, bufferLen);
+#define emberAfFillCommandVoice over ZigBeeClusterEstablishmentRequest( \
+  flag, \
+  ackNack, \
+  codecType, \
+  codecType, \
+  sampFreq, \
+  codecRate, \
+  serviceType, \
+  buffer, bufferLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ESTABLISHMENT_REQUEST_COMMAND_ID, \
+    "uuuuuuub", \
+    flag, \
+    ackNack, \
+    codecType, \
+    codecType, \
+    sampFreq, \
+    codecRate, \
+    serviceType, \
+    buffer, bufferLen \
+  );
 
 /** @brief Command description for VoiceTransmission
  *
  * Command: VoiceTransmission
  * @param voiceData INT8U []
  * @param voiceDataLen int
- * @param sequenceNumber INT8U
- * @param errorFlag ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmission(voiceData, voiceDataLen, sequenceNumber, errorFlag)                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMMAND_ID, "buu", voiceData, voiceDataLen, sequenceNumber, errorFlag);
+ * @param sequenceNumber INT8U 
+ * @param errorFlag ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmission( \
+  voiceData, voiceDataLen, \
+  sequenceNumber, \
+  errorFlag \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMMAND_ID, \
+    "buu", \
+    voiceData, voiceDataLen, \
+    sequenceNumber, \
+    errorFlag \
+  );
 
 /** @brief Command description for VoiceTransmissionCompletion
  *
  * Command: VoiceTransmissionCompletion
- * @param controlType ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterVoiceTransmissionCompletion(controlType)                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, "u", controlType);
+ * @param controlType ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterVoiceTransmissionCompletion( \
+  controlType \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_VOICE_TRANSMISSION_COMPLETION_COMMAND_ID, \
+    "u", \
+    controlType \
+  );
 
 /** @brief Command description for ControlResponse
  *
  * Command: ControlResponse
- * @param ackNack ENUM8
- */
-#define emberAfFillCommandVoice                                                                                                    \
-    over ZigBeeClusterControlResponse(ackNack) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_CONTROL_RESPONSE_COMMAND_ID, "u", ackNack);
+ * @param ackNack ENUM8 
+ */
+#define emberAfFillCommandVoice over ZigBeeClusterControlResponse( \
+  ackNack \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CONTROL_RESPONSE_COMMAND_ID, \
+    "u", \
+    ackNack \
+  );
 
 /** @brief Command description for JoinChatRequest
  *
  * Command: JoinChatRequest
- * @param uid INT16U
- * @param status ENUM8
- * @param nickname CHAR_STRING
- * @param cid INT16U
- * @param cid INT16U
- */
-#define emberAfFillCommandChattingClusterJoinChatRequest(uid, status, nickname, cid, cid)                                          \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, "uuuuu", uid, status, nickname, cid, cid);
+ * @param uid INT16U 
+ * @param status ENUM8 
+ * @param nickname CHAR_STRING 
+ * @param cid INT16U 
+ * @param cid INT16U 
+ */
+#define emberAfFillCommandChattingClusterJoinChatRequest( \
+  uid, \
+  status, \
+  nickname, \
+  cid, \
+  cid \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_JOIN_CHAT_REQUEST_COMMAND_ID, \
+    "uuuuu", \
+    uid, \
+    status, \
+    nickname, \
+    cid, \
+    cid \
+  );
 
 /** @brief Command description for LeaveChatRequest
  *
  * Command: LeaveChatRequest
- * @param cid INT16U
- * @param status ENUM8
- * @param uid INT16U
- * @param cid INT16U
+ * @param cid INT16U 
+ * @param status ENUM8 
+ * @param uid INT16U 
+ * @param cid INT16U 
  * @param chatParticipantList ChatParticipant []
  * @param chatParticipantListLen int
  */
-#define emberAfFillCommandChattingClusterLeaveChatRequest(cid, status, uid, cid, chatParticipantList, chatParticipantListLen)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, "uuuub", cid, status, uid, cid, chatParticipantList,              \
-                              chatParticipantListLen);
+#define emberAfFillCommandChattingClusterLeaveChatRequest( \
+  cid, \
+  status, \
+  uid, \
+  cid, \
+  chatParticipantList, chatParticipantListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LEAVE_CHAT_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    cid, \
+    status, \
+    uid, \
+    cid, \
+    chatParticipantList, chatParticipantListLen \
+  );
 
 /** @brief Command description for SearchChatRequest
  *
  * Command: SearchChatRequest
- * @param cid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSearchChatRequest(cid, uid, nickname)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, "uuu", cid, uid, nickname);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSearchChatRequest( \
+  cid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SEARCH_CHAT_REQUEST_COMMAND_ID, \
+    "uuu", \
+    cid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for SwitchChairmanResponse
  *
  * Command: SwitchChairmanResponse
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
- * @param uid INT16U
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanResponse(cid, cid, uid, uid, nickname)                                      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, "uuuuu", cid, cid, uid, uid, nickname);
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param uid INT16U 
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanResponse( \
+  cid, \
+  cid, \
+  uid, \
+  uid, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_RESPONSE_COMMAND_ID, \
+    "uuuuu", \
+    cid, \
+    cid, \
+    uid, \
+    uid, \
+    nickname \
+  );
 
 /** @brief Command description for StartChatRequest
  *
  * Command: StartChatRequest
- * @param name CHAR_STRING
- * @param options BITMAP8
- * @param uid INT16U
+ * @param name CHAR_STRING 
+ * @param options BITMAP8 
+ * @param uid INT16U 
  * @param chatRoomList ChatRoom []
  * @param chatRoomListLen int
- * @param nickname CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterStartChatRequest(name, options, uid, chatRoomList, chatRoomListLen, nickname)             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_CHAT_REQUEST_COMMAND_ID, "uuubu", name, options, uid, chatRoomList, chatRoomListLen,       \
-                              nickname);
+ * @param nickname CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterStartChatRequest( \
+  name, \
+  options, \
+  uid, \
+  chatRoomList, chatRoomListLen, \
+  nickname \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_CHAT_REQUEST_COMMAND_ID, \
+    "uuubu", \
+    name, \
+    options, \
+    uid, \
+    chatRoomList, chatRoomListLen, \
+    nickname \
+  );
 
 /** @brief Command description for ChatMessage
  *
  * Command: ChatMessage
- * @param destinationUid INT16U
- * @param cid INT16U
- * @param sourceUid INT16U
- * @param cid INT16U
- * @param nickname CHAR_STRING
- * @param message CHAR_STRING
- */
-#define emberAfFillCommandChattingClusterChatMessage(destinationUid, cid, sourceUid, cid, nickname, message)                       \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_CHAT_MESSAGE_COMMAND_ID, "uuuuuu", destinationUid, cid, sourceUid, cid, nickname, message);
+ * @param destinationUid INT16U 
+ * @param cid INT16U 
+ * @param sourceUid INT16U 
+ * @param cid INT16U 
+ * @param nickname CHAR_STRING 
+ * @param message CHAR_STRING 
+ */
+#define emberAfFillCommandChattingClusterChatMessage( \
+  destinationUid, \
+  cid, \
+  sourceUid, \
+  cid, \
+  nickname, \
+  message \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CHAT_MESSAGE_COMMAND_ID, \
+    "uuuuuu", \
+    destinationUid, \
+    cid, \
+    sourceUid, \
+    cid, \
+    nickname, \
+    message \
+  );
 
 /** @brief Command description for GetNodeInformationRequest
  *
  * Command: GetNodeInformationRequest
- * @param cid INT16U
- * @param cid INT16U
- * @param uid INT16U
+ * @param cid INT16U 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param nodeInformationList NodeInformation []
  * @param nodeInformationListLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationRequest(cid, cid, uid, nodeInformationList, nodeInformationListLen)     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, "uuub", cid, cid, uid, nodeInformationList,             \
-                              nodeInformationListLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationRequest( \
+  cid, \
+  cid, \
+  uid, \
+  nodeInformationList, nodeInformationListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uuub", \
+    cid, \
+    cid, \
+    uid, \
+    nodeInformationList, nodeInformationListLen \
+  );
 
 /** @brief Command description for SwitchChairmanNotification
  *
  * Command: SwitchChairmanNotification
- * @param cid INT16U
- * @param uid INT16U
- * @param address DATA16
- * @param endpoint INT8U
- */
-#define emberAfFillCommandChattingClusterSwitchChairmanNotification(cid, uid, address, endpoint)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, "uuuu", cid, uid, address, endpoint);
+ * @param cid INT16U 
+ * @param uid INT16U 
+ * @param address DATA16 
+ * @param endpoint INT8U 
+ */
+#define emberAfFillCommandChattingClusterSwitchChairmanNotification( \
+  cid, \
+  uid, \
+  address, \
+  endpoint \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SWITCH_CHAIRMAN_NOTIFICATION_COMMAND_ID, \
+    "uuuu", \
+    cid, \
+    uid, \
+    address, \
+    endpoint \
+  );
 
 /** @brief Command description for GetNodeInformationResponse
  *
  * Command: GetNodeInformationResponse
- * @param status ENUM8
- * @param cid INT16U
- * @param uid INT16U
+ * @param status ENUM8 
+ * @param cid INT16U 
+ * @param uid INT16U 
  * @param addressEndpointAndNickname INT8U []
  * @param addressEndpointAndNicknameLen int
  */
-#define emberAfFillCommandChattingClusterGetNodeInformationResponse(status, cid, uid, addressEndpointAndNickname,                  \
-                                                                    addressEndpointAndNicknameLen)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, "uuub", status, cid, uid, addressEndpointAndNickname,  \
-                              addressEndpointAndNicknameLen);
+#define emberAfFillCommandChattingClusterGetNodeInformationResponse( \
+  status, \
+  cid, \
+  uid, \
+  addressEndpointAndNickname, addressEndpointAndNicknameLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_NODE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuub", \
+    status, \
+    cid, \
+    uid, \
+    addressEndpointAndNickname, addressEndpointAndNicknameLen \
+  );
 
 /** @brief Command description for BuyRequest
  *
  * Command: BuyRequest
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- * @param transId INT16U
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterBuyRequest(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,        \
-                                                   goodId, price, timestamp, transId, transStatus)                                 \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BUY_REQUEST_COMMAND_ID, "uuuuuuuuuuu", userId, serialNumber, userType, currency, serviceId,      \
-                              priceTrailingDigit, goodId, price, timestamp, transId, transStatus);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ * @param transId INT16U 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterBuyRequest( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp, \
+  transId, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BUY_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp, \
+    transId, \
+    transStatus \
+  );
 
 /** @brief Command description for AcceptPayment
  *
  * Command: AcceptPayment
- * @param userId OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param userType INT16U
- * @param currency INT32U
- * @param serviceId INT16U
- * @param priceTrailingDigit INT8U
- * @param goodId OCTET_STRING
- * @param price INT32U
- * @param timestamp OCTET_STRING
- */
-#define emberAfFillCommandPaymentClusterAcceptPayment(userId, serialNumber, userType, currency, serviceId, priceTrailingDigit,     \
-                                                      goodId, price, timestamp)                                                    \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_ACCEPT_PAYMENT_COMMAND_ID, "uuuuuuuuu", userId, serialNumber, userType, currency, serviceId,     \
-                              priceTrailingDigit, goodId, price, timestamp);
+ * @param userId OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param userType INT16U 
+ * @param currency INT32U 
+ * @param serviceId INT16U 
+ * @param priceTrailingDigit INT8U 
+ * @param goodId OCTET_STRING 
+ * @param price INT32U 
+ * @param timestamp OCTET_STRING 
+ */
+#define emberAfFillCommandPaymentClusterAcceptPayment( \
+  userId, \
+  serialNumber, \
+  userType, \
+  currency, \
+  serviceId, \
+  priceTrailingDigit, \
+  goodId, \
+  price, \
+  timestamp \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ACCEPT_PAYMENT_COMMAND_ID, \
+    "uuuuuuuuu", \
+    userId, \
+    serialNumber, \
+    userType, \
+    currency, \
+    serviceId, \
+    priceTrailingDigit, \
+    goodId, \
+    price, \
+    timestamp \
+  );
 
 /** @brief Command description for PaymentConfirm
  *
  * Command: PaymentConfirm
- * @param serialNumber OCTET_STRING
- * @param serialNumber OCTET_STRING
- * @param transId INT16U
- * @param status ENUM8
- * @param transStatus ENUM8
- */
-#define emberAfFillCommandPaymentClusterPaymentConfirm(serialNumber, serialNumber, transId, status, transStatus)                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_PAYMENT_CONFIRM_COMMAND_ID, "uuuuu", serialNumber, serialNumber, transId, status, transStatus);
+ * @param serialNumber OCTET_STRING 
+ * @param serialNumber OCTET_STRING 
+ * @param transId INT16U 
+ * @param status ENUM8 
+ * @param transStatus ENUM8 
+ */
+#define emberAfFillCommandPaymentClusterPaymentConfirm( \
+  serialNumber, \
+  serialNumber, \
+  transId, \
+  status, \
+  transStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_PAYMENT_CONFIRM_COMMAND_ID, \
+    "uuuuu", \
+    serialNumber, \
+    serialNumber, \
+    transId, \
+    status, \
+    transStatus \
+  );
 
 /** @brief Command description for Subscribe
  *
  * Command: Subscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId)      \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SUBSCRIBE_COMMAND_ID, "uuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,         \
-                              serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SUBSCRIBE_COMMAND_ID, \
+    "uuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for Unsubscribe
  *
  * Command: Unsubscribe
- * @param userId OCTET_STRING
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- * @param serviceProviderId INT16U
- * @param timestamp OCTET_STRING
- * @param duration INT16U
- */
-#define emberAfFillCommandBillingClusterUnsubscribe(userId, userId, serviceId, serviceId, serviceProviderId, serviceProviderId,    \
-                                                    timestamp, duration)                                                           \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNSUBSCRIBE_COMMAND_ID, "uuuuuuuu", userId, userId, serviceId, serviceId, serviceProviderId,     \
-                              serviceProviderId, timestamp, duration);
+ * @param userId OCTET_STRING 
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param serviceProviderId INT16U 
+ * @param timestamp OCTET_STRING 
+ * @param duration INT16U 
+ */
+#define emberAfFillCommandBillingClusterUnsubscribe( \
+  userId, \
+  userId, \
+  serviceId, \
+  serviceId, \
+  serviceProviderId, \
+  serviceProviderId, \
+  timestamp, \
+  duration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNSUBSCRIBE_COMMAND_ID, \
+    "uuuuuuuu", \
+    userId, \
+    userId, \
+    serviceId, \
+    serviceId, \
+    serviceProviderId, \
+    serviceProviderId, \
+    timestamp, \
+    duration \
+  );
 
 /** @brief Command description for StartBillingSession
  *
  * Command: StartBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStartBillingSession(userId, serviceId, serviceProviderId)                                  \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_START_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStartBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_START_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for StopBillingSession
  *
  * Command: StopBillingSession
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterStopBillingSession(userId, serviceId, serviceProviderId)                                   \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_STOP_BILLING_SESSION_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterStopBillingSession( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STOP_BILLING_SESSION_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for BillStatusNotification
  *
  * Command: BillStatusNotification
- * @param userId OCTET_STRING
- * @param status ENUM8
- */
-#define emberAfFillCommandBillingClusterBillStatusNotification(userId, status)                                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, "uu", userId, status);
+ * @param userId OCTET_STRING 
+ * @param status ENUM8 
+ */
+#define emberAfFillCommandBillingClusterBillStatusNotification( \
+  userId, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    userId, \
+    status \
+  );
 
 /** @brief Command description for SessionKeepAlive
  *
  * Command: SessionKeepAlive
- * @param userId OCTET_STRING
- * @param serviceId INT16U
- * @param serviceProviderId INT16U
- */
-#define emberAfFillCommandBillingClusterSessionKeepAlive(userId, serviceId, serviceProviderId)                                     \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, "uuu", userId, serviceId, serviceProviderId);
+ * @param userId OCTET_STRING 
+ * @param serviceId INT16U 
+ * @param serviceProviderId INT16U 
+ */
+#define emberAfFillCommandBillingClusterSessionKeepAlive( \
+  userId, \
+  serviceId, \
+  serviceProviderId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SESSION_KEEP_ALIVE_COMMAND_ID, \
+    "uuu", \
+    userId, \
+    serviceId, \
+    serviceProviderId \
+  );
 
 /** @brief Command description for GetAlerts
  *
  * Command: GetAlerts
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterGetAlerts(alertsCount, alertStructures, alertStructuresLen)                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ALERTS_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterGetAlerts( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ALERTS_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for AlertsNotification
  *
  * Command: AlertsNotification
- * @param alertsCount AlertCount
+ * @param alertsCount AlertCount 
  * @param alertStructures AlertStructure []
  * @param alertStructuresLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterAlertsNotification(alertsCount, alertStructures, alertStructuresLen)                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ALERTS_NOTIFICATION_COMMAND_ID, "ub", alertsCount, alertStructures, alertStructuresLen);
+#define emberAfFillCommandAppliance Events and AlertClusterAlertsNotification( \
+  alertsCount, \
+  alertStructures, alertStructuresLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ALERTS_NOTIFICATION_COMMAND_ID, \
+    "ub", \
+    alertsCount, \
+    alertStructures, alertStructuresLen \
+  );
 
 /** @brief Command description for EventsNotification
  *
  * Command: EventsNotification
- * @param eventHeader INT8U
- * @param eventId EventIdentification
- */
-#define emberAfFillCommandAppliance                                                                                                \
-    Events and AlertClusterEventsNotification(eventHeader, eventId)                                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_EVENTS_NOTIFICATION_COMMAND_ID, "uu", eventHeader, eventId);
+ * @param eventHeader INT8U 
+ * @param eventId EventIdentification 
+ */
+#define emberAfFillCommandAppliance Events and AlertClusterEventsNotification( \
+  eventHeader, \
+  eventId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_EVENTS_NOTIFICATION_COMMAND_ID, \
+    "uu", \
+    eventHeader, \
+    eventId \
+  );
 
 /** @brief Command description for LogNotification
  *
  * Command: LogNotification
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogNotification(timeStamp, logId, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(     \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_NOTIFICATION_COMMAND_ID, "uuuub", timeStamp, logId, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogNotification( \
+  timeStamp, \
+  logId, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_NOTIFICATION_COMMAND_ID, \
+    "uuuub", \
+    timeStamp, \
+    logId, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueRequest
  *
  * Command: LogQueueRequest
- * @param timeStamp TIME_OF_DAY
- * @param logId INT32U
- * @param logLength INT32U
+ * @param timeStamp TIME_OF_DAY 
+ * @param logId INT32U 
+ * @param logLength INT32U 
  * @param logPayload INT8U []
  * @param logPayloadLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueRequest(timeStamp, logId, logLength, logPayload, logPayloadLen) emberAfFillExternalBuffer(            \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, "uuub", timeStamp, logId, logLength, logPayload, logPayloadLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueRequest( \
+  timeStamp, \
+  logId, \
+  logLength, \
+  logPayload, logPayloadLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_REQUEST_COMMAND_ID, \
+    "uuub", \
+    timeStamp, \
+    logId, \
+    logLength, \
+    logPayload, logPayloadLen \
+  );
 
 /** @brief Command description for LogQueueResponse
  *
  * Command: LogQueueResponse
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterLogQueueResponse(logQueueSize, logIds, logIdsLen)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterLogQueueResponse( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOG_QUEUE_RESPONSE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for StatisticsAvailable
  *
  * Command: StatisticsAvailable
- * @param logQueueSize INT8U
+ * @param logQueueSize INT8U 
  * @param logIds INT32U []
  * @param logIdsLen int
  */
-#define emberAfFillCommandAppliance                                                                                                \
-    StatisticsClusterStatisticsAvailable(logQueueSize, logIds, logIdsLen)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_STATISTICS_AVAILABLE_COMMAND_ID, "ub", logQueueSize, logIds, logIdsLen);
+#define emberAfFillCommandAppliance StatisticsClusterStatisticsAvailable( \
+  logQueueSize, \
+  logIds, logIdsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STATISTICS_AVAILABLE_COMMAND_ID, \
+    "ub", \
+    logQueueSize, \
+    logIds, logIdsLen \
+  );
 
 /** @brief Command description for GetProfileInfoCommand
  *
  * Command: GetProfileInfoCommand
- * @param profileCount INT8U
- * @param profileIntervalPeriod ENUM8
- * @param maxNumberOfIntervals INT8U
+ * @param profileCount INT8U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param maxNumberOfIntervals INT8U 
  * @param listOfAttributes INT16U []
  * @param listOfAttributesLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetProfileInfoCommand(profileCount, profileIntervalPeriod, maxNumberOfIntervals, listOfAttributes,           \
-                                            listOfAttributesLen)                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, "uuub", profileCount, profileIntervalPeriod,            \
-                                  maxNumberOfIntervals, listOfAttributes, listOfAttributesLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetProfileInfoCommand( \
+  profileCount, \
+  profileIntervalPeriod, \
+  maxNumberOfIntervals, \
+  listOfAttributes, listOfAttributesLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID, \
+    "uuub", \
+    profileCount, \
+    profileIntervalPeriod, \
+    maxNumberOfIntervals, \
+    listOfAttributes, listOfAttributesLen \
+  );
 
 /** @brief Command description for GetMeasurementProfileResponseCommand
  *
  * Command: GetMeasurementProfileResponseCommand
- * @param startTime INT32U
- * @param attributeId INT16U
- * @param status ENUM8
- * @param startTime INT32U
- * @param profileIntervalPeriod ENUM8
- * @param numberOfIntervals ENUM8
- * @param numberOfIntervalsDelivered INT8U
- * @param attributeId INT16U
+ * @param startTime INT32U 
+ * @param attributeId INT16U 
+ * @param status ENUM8 
+ * @param startTime INT32U 
+ * @param profileIntervalPeriod ENUM8 
+ * @param numberOfIntervals ENUM8 
+ * @param numberOfIntervalsDelivered INT8U 
+ * @param attributeId INT16U 
  * @param intervals INT8U []
  * @param intervalsLen int
  */
-#define emberAfFillCommandElectrical                                                                                               \
-    MeasurementClusterGetMeasurementProfileResponseCommand(startTime, attributeId, status, startTime, profileIntervalPeriod,       \
-                                                           numberOfIntervals, numberOfIntervalsDelivered, attributeId, intervals,  \
-                                                           intervalsLen)                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, "uuuuuuuub", startTime, attributeId,    \
-                                  status, startTime, profileIntervalPeriod, numberOfIntervals, numberOfIntervalsDelivered,         \
-                                  attributeId, intervals, intervalsLen);
+#define emberAfFillCommandElectrical MeasurementClusterGetMeasurementProfileResponseCommand( \
+  startTime, \
+  attributeId, \
+  status, \
+  startTime, \
+  profileIntervalPeriod, \
+  numberOfIntervals, \
+  numberOfIntervalsDelivered, \
+  attributeId, \
+  intervals, intervalsLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID, \
+    "uuuuuuuub", \
+    startTime, \
+    attributeId, \
+    status, \
+    startTime, \
+    profileIntervalPeriod, \
+    numberOfIntervals, \
+    numberOfIntervalsDelivered, \
+    attributeId, \
+    intervals, intervalsLen \
+  );
 
 /** @brief Command description for ScanRequest
  *
  * Command: ScanRequest
- * @param transaction INT32U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanRequest(transaction, zigbeeInformation, zllInformation)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_REQUEST_COMMAND_ID, "uuu", transaction, zigbeeInformation, zllInformation);
+ * @param transaction INT32U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanRequest( \
+  transaction, \
+  zigbeeInformation, \
+  zllInformation \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_REQUEST_COMMAND_ID, \
+    "uuu", \
+    transaction, \
+    zigbeeInformation, \
+    zllInformation \
+  );
 
 /** @brief Command description for ScanResponse
  *
  * Command: ScanResponse
- * @param transaction INT32U
- * @param rssiCorrection INT8U
- * @param zigbeeInformation ZigbeeInformation
- * @param zllInformation ZllInformation
- * @param keyBitmask KeyBitmask
- * @param responseId INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param numberOfSubDevices INT8U
- * @param totalGroupIds INT8U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- * @param groupIdCount INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterScanResponse(transaction, rssiCorrection, zigbeeInformation, zllInformation, keyBitmask, responseId,       \
-                                     extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress, numberOfSubDevices,    \
-                                     totalGroupIds, endpointId, profileId, deviceId, version, groupIdCount)                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SCAN_RESPONSE_COMMAND_ID, "uuuuuuuuuuuuuuuuuu", transaction, rssiCorrection,                 \
-                                  zigbeeInformation, zllInformation, keyBitmask, responseId, extendedPanId, networkUpdateId,       \
-                                  logicalChannel, panId, networkAddress, numberOfSubDevices, totalGroupIds, endpointId, profileId, \
-                                  deviceId, version, groupIdCount);
+ * @param transaction INT32U 
+ * @param rssiCorrection INT8U 
+ * @param zigbeeInformation ZigbeeInformation 
+ * @param zllInformation ZllInformation 
+ * @param keyBitmask KeyBitmask 
+ * @param responseId INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param numberOfSubDevices INT8U 
+ * @param totalGroupIds INT8U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ * @param groupIdCount INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterScanResponse( \
+  transaction, \
+  rssiCorrection, \
+  zigbeeInformation, \
+  zllInformation, \
+  keyBitmask, \
+  responseId, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  numberOfSubDevices, \
+  totalGroupIds, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version, \
+  groupIdCount \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SCAN_RESPONSE_COMMAND_ID, \
+    "uuuuuuuuuuuuuuuuuu", \
+    transaction, \
+    rssiCorrection, \
+    zigbeeInformation, \
+    zllInformation, \
+    keyBitmask, \
+    responseId, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    numberOfSubDevices, \
+    totalGroupIds, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version, \
+    groupIdCount \
+  );
 
 /** @brief Command description for DeviceInformationRequest
  *
  * Command: DeviceInformationRequest
- * @param transaction INT32U
- * @param startIndex INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationRequest(transaction, startIndex)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, "uu", transaction, startIndex);
+ * @param transaction INT32U 
+ * @param startIndex INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationRequest( \
+  transaction, \
+  startIndex \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    startIndex \
+  );
 
 /** @brief Command description for DeviceInformationResponse
  *
  * Command: DeviceInformationResponse
- * @param transaction INT32U
- * @param numberOfSubDevices INT8U
- * @param startIndex INT8U
- * @param deviceInformationRecordCount INT8U
+ * @param transaction INT32U 
+ * @param numberOfSubDevices INT8U 
+ * @param startIndex INT8U 
+ * @param deviceInformationRecordCount INT8U 
  * @param deviceInformationRecordList DeviceInformationRecord []
  * @param deviceInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterDeviceInformationResponse(transaction, numberOfSubDevices, startIndex, deviceInformationRecordCount,       \
-                                                  deviceInformationRecordList, deviceInformationRecordListLen)                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, "uuuub", transaction, numberOfSubDevices,            \
-                                  startIndex, deviceInformationRecordCount, deviceInformationRecordList,                           \
-                                  deviceInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterDeviceInformationResponse( \
+  transaction, \
+  numberOfSubDevices, \
+  startIndex, \
+  deviceInformationRecordCount, \
+  deviceInformationRecordList, deviceInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEVICE_INFORMATION_RESPONSE_COMMAND_ID, \
+    "uuuub", \
+    transaction, \
+    numberOfSubDevices, \
+    startIndex, \
+    deviceInformationRecordCount, \
+    deviceInformationRecordList, deviceInformationRecordListLen \
+  );
 
 /** @brief Command description for IdentifyRequest
  *
  * Command: IdentifyRequest
- * @param transaction INT32U
- * @param identifyDuration INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterIdentifyRequest(transaction, identifyDuration)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_IDENTIFY_REQUEST_COMMAND_ID, "uu", transaction, identifyDuration);
+ * @param transaction INT32U 
+ * @param identifyDuration INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterIdentifyRequest( \
+  transaction, \
+  identifyDuration \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_IDENTIFY_REQUEST_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    identifyDuration \
+  );
 
 /** @brief Command description for ResetToFactoryNewRequest
  *
  * Command: ResetToFactoryNewRequest
- * @param transaction INT32U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterResetToFactoryNewRequest(transaction)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, "u", transaction);
+ * @param transaction INT32U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterResetToFactoryNewRequest( \
+  transaction \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RESET_TO_FACTORY_NEW_REQUEST_COMMAND_ID, \
+    "u", \
+    transaction \
+  );
 
 /** @brief Command description for NetworkStartRequest
  *
  * Command: NetworkStartRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- * @param initiatorIeeeAddress IEEE_ADDRESS
- * @param initiatorNetworkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartRequest(                                                                                       \
-        transaction, extendedPanId, keyIndex, encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,   \
-        groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin,              \
-        freeGroupIdentifierRangeEnd, initiatorIeeeAddress, initiatorNetworkAddress)                                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuuu", transaction, extendedPanId, keyIndex,   \
-                                  encryptedNetworkKey, logicalChannel, panId, networkAddress, groupIdentifiersBegin,               \
-                                  groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,                   \
-                                  freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd, initiatorIeeeAddress,                \
-                                  initiatorNetworkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ * @param initiatorIeeeAddress IEEE_ADDRESS 
+ * @param initiatorNetworkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd, \
+  initiatorIeeeAddress, \
+  initiatorNetworkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd, \
+    initiatorIeeeAddress, \
+    initiatorNetworkAddress \
+  );
 
 /** @brief Command description for NetworkStartResponse
  *
  * Command: NetworkStartResponse
- * @param transaction INT32U
- * @param status ZllStatus
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkStartResponse(transaction, status, extendedPanId, networkUpdateId, logicalChannel, panId)           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_START_RESPONSE_COMMAND_ID, "uuuuuu", transaction, status, extendedPanId,             \
-                                  networkUpdateId, logicalChannel, panId);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkStartResponse( \
+  transaction, \
+  status, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_START_RESPONSE_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    status, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId \
+  );
 
 /** @brief Command description for NetworkJoinRouterRequest
  *
  * Command: NetworkJoinRouterRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,       \
-                                                 logicalChannel, panId, networkAddress, groupIdentifiersBegin,                     \
-                                                 groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd,    \
-                                                 freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,        \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinRouterResponse
  *
  * Command: NetworkJoinRouterResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinRouterResponse(transaction, status)                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinRouterResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_ROUTER_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceRequest
  *
  * Command: NetworkJoinEndDeviceRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param keyIndex KeyIndex
- * @param encryptedNetworkKey SECURITY_KEY
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- * @param groupIdentifiersBegin INT16U
- * @param groupIdentifiersEnd INT16U
- * @param freeNetworkAddressRangeBegin INT16U
- * @param freeNetworkAddressRangeEnd INT16U
- * @param freeGroupIdentifierRangeBegin INT16U
- * @param freeGroupIdentifierRangeEnd INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceRequest(transaction, extendedPanId, keyIndex, encryptedNetworkKey, networkUpdateId,    \
-                                                    logicalChannel, panId, networkAddress, groupIdentifiersBegin,                  \
-                                                    groupIdentifiersEnd, freeNetworkAddressRangeBegin, freeNetworkAddressRangeEnd, \
-                                                    freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd)                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, "uuuuuuuuuuuuuu", transaction, extendedPanId,    \
-                                  keyIndex, encryptedNetworkKey, networkUpdateId, logicalChannel, panId, networkAddress,           \
-                                  groupIdentifiersBegin, groupIdentifiersEnd, freeNetworkAddressRangeBegin,                        \
-                                  freeNetworkAddressRangeEnd, freeGroupIdentifierRangeBegin, freeGroupIdentifierRangeEnd);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param keyIndex KeyIndex 
+ * @param encryptedNetworkKey SECURITY_KEY 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ * @param groupIdentifiersBegin INT16U 
+ * @param groupIdentifiersEnd INT16U 
+ * @param freeNetworkAddressRangeBegin INT16U 
+ * @param freeNetworkAddressRangeEnd INT16U 
+ * @param freeGroupIdentifierRangeBegin INT16U 
+ * @param freeGroupIdentifierRangeEnd INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceRequest( \
+  transaction, \
+  extendedPanId, \
+  keyIndex, \
+  encryptedNetworkKey, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress, \
+  groupIdentifiersBegin, \
+  groupIdentifiersEnd, \
+  freeNetworkAddressRangeBegin, \
+  freeNetworkAddressRangeEnd, \
+  freeGroupIdentifierRangeBegin, \
+  freeGroupIdentifierRangeEnd \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_REQUEST_COMMAND_ID, \
+    "uuuuuuuuuuuuuu", \
+    transaction, \
+    extendedPanId, \
+    keyIndex, \
+    encryptedNetworkKey, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress, \
+    groupIdentifiersBegin, \
+    groupIdentifiersEnd, \
+    freeNetworkAddressRangeBegin, \
+    freeNetworkAddressRangeEnd, \
+    freeGroupIdentifierRangeBegin, \
+    freeGroupIdentifierRangeEnd \
+  );
 
 /** @brief Command description for NetworkJoinEndDeviceResponse
  *
  * Command: NetworkJoinEndDeviceResponse
- * @param transaction INT32U
- * @param status ZllStatus
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkJoinEndDeviceResponse(transaction, status)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, "uu", transaction, status);
+ * @param transaction INT32U 
+ * @param status ZllStatus 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkJoinEndDeviceResponse( \
+  transaction, \
+  status \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_JOIN_END_DEVICE_RESPONSE_COMMAND_ID, \
+    "uu", \
+    transaction, \
+    status \
+  );
 
 /** @brief Command description for NetworkUpdateRequest
  *
  * Command: NetworkUpdateRequest
- * @param transaction INT32U
- * @param extendedPanId IEEE_ADDRESS
- * @param networkUpdateId INT8U
- * @param logicalChannel INT8U
- * @param panId INT16U
- * @param networkAddress INT16U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterNetworkUpdateRequest(transaction, extendedPanId, networkUpdateId, logicalChannel, panId, networkAddress)   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, "uuuuuu", transaction, extendedPanId, networkUpdateId,    \
-                                  logicalChannel, panId, networkAddress);
+ * @param transaction INT32U 
+ * @param extendedPanId IEEE_ADDRESS 
+ * @param networkUpdateId INT8U 
+ * @param logicalChannel INT8U 
+ * @param panId INT16U 
+ * @param networkAddress INT16U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterNetworkUpdateRequest( \
+  transaction, \
+  extendedPanId, \
+  networkUpdateId, \
+  logicalChannel, \
+  panId, \
+  networkAddress \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_NETWORK_UPDATE_REQUEST_COMMAND_ID, \
+    "uuuuuu", \
+    transaction, \
+    extendedPanId, \
+    networkUpdateId, \
+    logicalChannel, \
+    panId, \
+    networkAddress \
+  );
 
 /** @brief Command description for EndpointInformation
  *
  * Command: EndpointInformation
- * @param ieeeAddress IEEE_ADDRESS
- * @param networkAddress INT16U
- * @param endpointId INT8U
- * @param profileId INT16U
- * @param deviceId INT16U
- * @param version INT8U
- */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterEndpointInformation(ieeeAddress, networkAddress, endpointId, profileId, deviceId, version)                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENDPOINT_INFORMATION_COMMAND_ID, "uuuuuu", ieeeAddress, networkAddress, endpointId,          \
-                                  profileId, deviceId, version);
+ * @param ieeeAddress IEEE_ADDRESS 
+ * @param networkAddress INT16U 
+ * @param endpointId INT8U 
+ * @param profileId INT16U 
+ * @param deviceId INT16U 
+ * @param version INT8U 
+ */
+#define emberAfFillCommandZLL CommissioningClusterEndpointInformation( \
+  ieeeAddress, \
+  networkAddress, \
+  endpointId, \
+  profileId, \
+  deviceId, \
+  version \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENDPOINT_INFORMATION_COMMAND_ID, \
+    "uuuuuu", \
+    ieeeAddress, \
+    networkAddress, \
+    endpointId, \
+    profileId, \
+    deviceId, \
+    version \
+  );
 
 /** @brief Command description for GetGroupIdentifiersRequest
  *
  * Command: GetGroupIdentifiersRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param groupInformationRecordList GroupInformationRecord []
  * @param groupInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetGroupIdentifiersRequest(startIndex, total, startIndex, count, groupInformationRecordList,               \
-                                                   groupInformationRecordListLen)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,     \
-                                  groupInformationRecordList, groupInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetGroupIdentifiersRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  groupInformationRecordList, groupInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_GROUP_IDENTIFIERS_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    groupInformationRecordList, groupInformationRecordListLen \
+  );
 
 /** @brief Command description for GetEndpointListRequest
  *
  * Command: GetEndpointListRequest
- * @param startIndex INT8U
- * @param total INT8U
- * @param startIndex INT8U
- * @param count INT8U
+ * @param startIndex INT8U 
+ * @param total INT8U 
+ * @param startIndex INT8U 
+ * @param count INT8U 
  * @param endpointInformationRecordList EndpointInformationRecord []
  * @param endpointInformationRecordListLen int
  */
-#define emberAfFillCommandZLL                                                                                                      \
-    CommissioningClusterGetEndpointListRequest(startIndex, total, startIndex, count, endpointInformationRecordList,                \
-                                               endpointInformationRecordListLen)                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, "uuuub", startIndex, total, startIndex, count,         \
-                                  endpointInformationRecordList, endpointInformationRecordListLen);
+#define emberAfFillCommandZLL CommissioningClusterGetEndpointListRequest( \
+  startIndex, \
+  total, \
+  startIndex, \
+  count, \
+  endpointInformationRecordList, endpointInformationRecordListLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_GET_ENDPOINT_LIST_REQUEST_COMMAND_ID, \
+    "uuuub", \
+    startIndex, \
+    total, \
+    startIndex, \
+    count, \
+    endpointInformationRecordList, endpointInformationRecordListLen \
+  );
 
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_BIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterBind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_BIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId NODE_ID
- * @param groupId GROUP_ID
- * @param endpointId ENDPOINT_ID
- * @param clusterId CLUSTER_ID
- */
-#define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \
-    emberAfFillExternalBuffer(mask,                                                                                                \
-                                                                                                                                   \
-                              ZCL_UNBIND_COMMAND_ID, "uuuu", nodeId, groupId, endpointId, clusterId);
+ * @param nodeId NODE_ID 
+ * @param groupId GROUP_ID 
+ * @param endpointId ENDPOINT_ID 
+ * @param clusterId CLUSTER_ID 
+ */
+#define emberAfFillCommandBindingClusterUnbind( \
+  nodeId, \
+  groupId, \
+  endpointId, \
+  clusterId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNBIND_COMMAND_ID, \
+    "uuuu", \
+    nodeId, \
+    groupId, \
+    endpointId, \
+    clusterId \
+  );
 
 /** @brief Command description for CommandOne
  *
  * Command: CommandOne
- * @param argOne INT8U
- * @param argOne INT8U
- */
-#define emberAfFillCommandSample                                                                                                   \
-    Mfg Specific ClusterClusterCommandOne(argOne, argOne)                                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_COMMAND_ONE_COMMAND_ID, "uu", argOne, argOne);
+ * @param argOne INT8U 
+ * @param argOne INT8U 
+ */
+#define emberAfFillCommandSample Mfg Specific ClusterClusterCommandOne( \
+  argOne, \
+  argOne \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_COMMAND_ONE_COMMAND_ID, \
+    "uu", \
+    argOne, \
+    argOne \
+  );
 
 /** @brief Command description for SetToken
  *
  * Command: SetToken
- * @param token INT16U
- * @param token INT16U
- * @param data OCTET_STRING
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterSetToken(token, token, data, data)                                                                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_TOKEN_COMMAND_ID, "uuuu", token, token, data, data);
+ * @param token INT16U 
+ * @param token INT16U 
+ * @param data OCTET_STRING 
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterSetToken( \
+  token, \
+  token, \
+  data, \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_TOKEN_COMMAND_ID, \
+    "uuuu", \
+    token, \
+    token, \
+    data, \
+    data \
+  );
 
 /** @brief Command description for LockTokens
  *
  * Command: LockTokens
  */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterLockTokens() emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_LOCK_TOKENS_COMMAND_ID, "", );
+#define emberAfFillCommandConfiguration ClusterClusterLockTokens( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_LOCK_TOKENS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ReadTokens
  *
  * Command: ReadTokens
- * @param token INT16U
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterReadTokens(token) emberAfFillExternalBuffer(mask,                                                                \
-                                                                                                                                   \
-                                                              ZCL_READ_TOKENS_COMMAND_ID, "u", token);
+ * @param token INT16U 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterReadTokens( \
+  token \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_READ_TOKENS_COMMAND_ID, \
+    "u", \
+    token \
+  );
 
 /** @brief Command description for UnlockTokens
  *
  * Command: UnlockTokens
- * @param data OCTET_STRING
- */
-#define emberAfFillCommandConfiguration                                                                                            \
-    ClusterClusterUnlockTokens(data) emberAfFillExternalBuffer(mask,                                                               \
-                                                                                                                                   \
-                                                               ZCL_UNLOCK_TOKENS_COMMAND_ID, "u", data);
+ * @param data OCTET_STRING 
+ */
+#define emberAfFillCommandConfiguration ClusterClusterUnlockTokens( \
+  data \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_UNLOCK_TOKENS_COMMAND_ID, \
+    "u", \
+    data \
+  );
 
 /** @brief Command description for stream
  *
  * Command: stream
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterstream(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_STREAM_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterstream( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_STREAM_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for tone
  *
  * Command: tone
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClustertone(channel, power, time) emberAfFillExternalBuffer(mask,                                                       \
-                                                                                                                                   \
-                                                                       ZCL_TONE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClustertone( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TONE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for rxMode
  *
  * Command: rxMode
- * @param channel INT8U
- * @param power INT8S
- * @param time INT16U
- */
-#define emberAfFillCommandMFGLIB                                                                                                   \
-    ClusterClusterrxMode(channel, power, time) emberAfFillExternalBuffer(mask,                                                     \
-                                                                                                                                   \
-                                                                         ZCL_RX_MODE_COMMAND_ID, "uuu", channel, power, time);
+ * @param channel INT8U 
+ * @param power INT8S 
+ * @param time INT16U 
+ */
+#define emberAfFillCommandMFGLIB ClusterClusterrxMode( \
+  channel, \
+  power, \
+  time \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_RX_MODE_COMMAND_ID, \
+    "uuu", \
+    channel, \
+    power, \
+    time \
+  );
 
 /** @brief Command description for EnableApsLinkKeyAuthorization
  *
  * Command: EnableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param clusterId CLUSTER_ID
+ * @param numberExemptClusters INT8U 
+ * @param clusterId CLUSTER_ID 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param apsLinkKeyAuthStatus BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableApsLinkKeyAuthorization(numberExemptClusters, clusterId, clusterId, clusterIdLen,              \
-                                                            apsLinkKeyAuthStatus)                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubu", numberExemptClusters, clusterId,       \
-                                  clusterId, clusterIdLen, apsLinkKeyAuthStatus);
+ * @param apsLinkKeyAuthStatus BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  clusterId, \
+  clusterId, clusterIdLen, \
+  apsLinkKeyAuthStatus \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubu", \
+    numberExemptClusters, \
+    clusterId, \
+    clusterId, clusterIdLen, \
+    apsLinkKeyAuthStatus \
+  );
 
 /** @brief Command description for DisableApsLinkKeyAuthorization
  *
  * Command: DisableApsLinkKeyAuthorization
- * @param numberExemptClusters INT8U
- * @param powerNotificationReason WwahPowerNotificationReason
+ * @param numberExemptClusters INT8U 
+ * @param powerNotificationReason WwahPowerNotificationReason 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableApsLinkKeyAuthorization(numberExemptClusters, powerNotificationReason, clusterId,             \
-                                                             clusterIdLen, manufacturerId, manufacturerReasonLength,               \
-                                                             manufacturerReason, manufacturerReasonLen)                            \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, "uubuub", numberExemptClusters,               \
-                                  powerNotificationReason, clusterId, clusterIdLen, manufacturerId, manufacturerReasonLength,      \
-                                  manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableApsLinkKeyAuthorization( \
+  numberExemptClusters, \
+  powerNotificationReason, \
+  clusterId, clusterIdLen, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_APS_LINK_KEY_AUTHORIZATION_COMMAND_ID, \
+    "uubuub", \
+    numberExemptClusters, \
+    powerNotificationReason, \
+    clusterId, clusterIdLen, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for ApsLinkKeyAuthorizationQuery
  *
  * Command: ApsLinkKeyAuthorizationQuery
- * @param clusterId CLUSTER_ID
- * @param powerNotificationReason WwahPowerNotificationReason
- * @param manufacturerId INT16U
- * @param manufacturerReasonLength INT8U
+ * @param clusterId CLUSTER_ID 
+ * @param powerNotificationReason WwahPowerNotificationReason 
+ * @param manufacturerId INT16U 
+ * @param manufacturerReasonLength INT8U 
  * @param manufacturerReason INT8U []
  * @param manufacturerReasonLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsLinkKeyAuthorizationQuery(clusterId, powerNotificationReason, manufacturerId,                     \
-                                                           manufacturerReasonLength, manufacturerReason, manufacturerReasonLen)    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, "uuuub", clusterId, powerNotificationReason,    \
-                                  manufacturerId, manufacturerReasonLength, manufacturerReason, manufacturerReasonLen);
+#define emberAfFillCommandSL Works With All HubsClusterApsLinkKeyAuthorizationQuery( \
+  clusterId, \
+  powerNotificationReason, \
+  manufacturerId, \
+  manufacturerReasonLength, \
+  manufacturerReason, manufacturerReasonLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_LINK_KEY_AUTHORIZATION_QUERY_COMMAND_ID, \
+    "uuuub", \
+    clusterId, \
+    powerNotificationReason, \
+    manufacturerId, \
+    manufacturerReasonLength, \
+    manufacturerReason, manufacturerReasonLen \
+  );
 
 /** @brief Command description for RequestNewApsLinkKey
  *
  * Command: RequestNewApsLinkKey
- * @param deviceEui64 IEEE_ADDRESS
- * @param deviceShort INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestNewApsLinkKey(deviceEui64, deviceShort)                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, "uu", deviceEui64, deviceShort);
+ * @param deviceEui64 IEEE_ADDRESS 
+ * @param deviceShort INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestNewApsLinkKey( \
+  deviceEui64, \
+  deviceShort \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_NEW_APS_LINK_KEY_COMMAND_ID, \
+    "uu", \
+    deviceEui64, \
+    deviceShort \
+  );
 
 /** @brief Command description for EnableWwahAppEventRetryAlgorithm
  *
  * Command: EnableWwahAppEventRetryAlgorithm
- * @param firstBackoffTimeSeconds INT8U
- * @param numberExemptClusters INT8U
- * @param backoffSeqCommonRatio INT8U
+ * @param firstBackoffTimeSeconds INT8U 
+ * @param numberExemptClusters INT8U 
+ * @param backoffSeqCommonRatio INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
- * @param maxBackoffTimeSeconds INT32U
- * @param maxRedeliveryAttempts INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahAppEventRetryAlgorithm(                                                                    \
-        firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio, clusterId, clusterIdLen, maxBackoffTimeSeconds,      \
-        maxRedeliveryAttempts) emberAfFillExternalBuffer(mask,                                                                     \
-                                                                                                                                   \
-                                                         ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuubuu",           \
-                                                         firstBackoffTimeSeconds, numberExemptClusters, backoffSeqCommonRatio,     \
-                                                         clusterId, clusterIdLen, maxBackoffTimeSeconds, maxRedeliveryAttempts);
+ * @param maxBackoffTimeSeconds INT32U 
+ * @param maxRedeliveryAttempts INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahAppEventRetryAlgorithm( \
+  firstBackoffTimeSeconds, \
+  numberExemptClusters, \
+  backoffSeqCommonRatio, \
+  clusterId, clusterIdLen, \
+  maxBackoffTimeSeconds, \
+  maxRedeliveryAttempts \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuubuu", \
+    firstBackoffTimeSeconds, \
+    numberExemptClusters, \
+    backoffSeqCommonRatio, \
+    clusterId, clusterIdLen, \
+    maxBackoffTimeSeconds, \
+    maxRedeliveryAttempts \
+  );
 
 /** @brief Command description for DisableWwahAppEventRetryAlgorithm
  *
  * Command: DisableWwahAppEventRetryAlgorithm
- * @param currentPowerMode INT32U
- * @param availablePowerSources INT32U
- * @param currentPowerSource INT32U
- * @param currentPowerSourceLevel INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahAppEventRetryAlgorithm(currentPowerMode, availablePowerSources, currentPowerSource,       \
-                                                                currentPowerSourceLevel)                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, "uuuu", currentPowerMode,                 \
-                                  availablePowerSources, currentPowerSource, currentPowerSourceLevel);
+ * @param currentPowerMode INT32U 
+ * @param availablePowerSources INT32U 
+ * @param currentPowerSource INT32U 
+ * @param currentPowerSourceLevel INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahAppEventRetryAlgorithm( \
+  currentPowerMode, \
+  availablePowerSources, \
+  currentPowerSource, \
+  currentPowerSourceLevel \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_APP_EVENT_RETRY_ALGORITHM_COMMAND_ID, \
+    "uuuu", \
+    currentPowerMode, \
+    availablePowerSources, \
+    currentPowerSource, \
+    currentPowerSourceLevel \
+  );
 
 /** @brief Command description for RequestTime
  *
  * Command: RequestTime
- * @param debugReportId INT8U
- * @param debugReportSize INT32U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequestTime(debugReportId, debugReportSize)                                                          \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REQUEST_TIME_COMMAND_ID, "uu", debugReportId, debugReportSize);
+ * @param debugReportId INT8U 
+ * @param debugReportSize INT32U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterRequestTime( \
+  debugReportId, \
+  debugReportSize \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUEST_TIME_COMMAND_ID, \
+    "uu", \
+    debugReportId, \
+    debugReportSize \
+  );
 
 /** @brief Command description for EnableWwahRejoinAlgorithm
  *
  * Command: EnableWwahRejoinAlgorithm
- * @param fastRejoinTimeoutSeconds INT16U
- * @param debugReportId INT8U
- * @param durationBetweenRejoinsSeconds INT16U
+ * @param fastRejoinTimeoutSeconds INT16U 
+ * @param debugReportId INT8U 
+ * @param durationBetweenRejoinsSeconds INT16U 
  * @param debugReportData INT8U []
  * @param debugReportDataLen int
- * @param fastRejoinFirstBackoffSeconds INT16U
- * @param maxBackoffTimeSeconds INT16U
- * @param maxBackoffIterations INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahRejoinAlgorithm(fastRejoinTimeoutSeconds, debugReportId, durationBetweenRejoinsSeconds,    \
-                                                        debugReportData, debugReportDataLen, fastRejoinFirstBackoffSeconds,        \
-                                                        maxBackoffTimeSeconds, maxBackoffIterations)                               \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "uuubuuu", fastRejoinTimeoutSeconds, debugReportId, \
-                                  durationBetweenRejoinsSeconds, debugReportData, debugReportDataLen,                              \
-                                  fastRejoinFirstBackoffSeconds, maxBackoffTimeSeconds, maxBackoffIterations);
+ * @param fastRejoinFirstBackoffSeconds INT16U 
+ * @param maxBackoffTimeSeconds INT16U 
+ * @param maxBackoffIterations INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahRejoinAlgorithm( \
+  fastRejoinTimeoutSeconds, \
+  debugReportId, \
+  durationBetweenRejoinsSeconds, \
+  debugReportData, debugReportDataLen, \
+  fastRejoinFirstBackoffSeconds, \
+  maxBackoffTimeSeconds, \
+  maxBackoffIterations \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "uuubuuu", \
+    fastRejoinTimeoutSeconds, \
+    debugReportId, \
+    durationBetweenRejoinsSeconds, \
+    debugReportData, debugReportDataLen, \
+    fastRejoinFirstBackoffSeconds, \
+    maxBackoffTimeSeconds, \
+    maxBackoffIterations \
+  );
 
 /** @brief Command description for DisableWwahRejoinAlgorithm
  *
  * Command: DisableWwahRejoinAlgorithm
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahRejoinAlgorithm(numberOfClusters, clusterId, clusterIdLen)                                \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahRejoinAlgorithm( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_REJOIN_ALGORITHM_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for SetIasZoneEnrollmentMethod
  *
  * Command: SetIasZoneEnrollmentMethod
- * @param enrollmentMode WwahIasZoneEnrollmentMode
- * @param numberOfBeacons INT8U
+ * @param enrollmentMode WwahIasZoneEnrollmentMode 
+ * @param numberOfBeacons INT8U 
  * @param beacon WwahBeaconSurvey []
  * @param beaconLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetIasZoneEnrollmentMethod(enrollmentMode, numberOfBeacons, beacon, beaconLen)                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, "uub", enrollmentMode, numberOfBeacons, beacon,   \
-                                  beaconLen);
+#define emberAfFillCommandSL Works With All HubsClusterSetIasZoneEnrollmentMethod( \
+  enrollmentMode, \
+  numberOfBeacons, \
+  beacon, beaconLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_IAS_ZONE_ENROLLMENT_METHOD_COMMAND_ID, \
+    "uub", \
+    enrollmentMode, \
+    numberOfBeacons, \
+    beacon, beaconLen \
+  );
 
 /** @brief Command description for ClearBindingTable
  *
  * Command: ClearBindingTable
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterClearBindingTable() emberAfFillExternalBuffer(mask,                                                  \
-                                                                                                                                   \
-                                                                            ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterClearBindingTable( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_CLEAR_BINDING_TABLE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnablePeriodicRouterCheckIns
  *
  * Command: EnablePeriodicRouterCheckIns
- * @param checkInInterval INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnablePeriodicRouterCheckIns(checkInInterval)                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "u", checkInInterval);
+ * @param checkInInterval INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterEnablePeriodicRouterCheckIns( \
+  checkInInterval \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "u", \
+    checkInInterval \
+  );
 
 /** @brief Command description for DisablePeriodicRouterCheckIns
  *
  * Command: DisablePeriodicRouterCheckIns
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisablePeriodicRouterCheckIns()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisablePeriodicRouterCheckIns( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_PERIODIC_ROUTER_CHECK_INS_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for SetMacPollFailureWaitTime
  *
  * Command: SetMacPollFailureWaitTime
- * @param waitTime INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetMacPollFailureWaitTime(waitTime)                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, "u", waitTime);
+ * @param waitTime INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetMacPollFailureWaitTime( \
+  waitTime \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_MAC_POLL_FAILURE_WAIT_TIME_COMMAND_ID, \
+    "u", \
+    waitTime \
+  );
 
 /** @brief Command description for SetPendingNetworkUpdate
  *
  * Command: SetPendingNetworkUpdate
- * @param channel INT8U
- * @param panId INT16U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSetPendingNetworkUpdate(channel, panId)                                                              \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, "uu", channel, panId);
+ * @param channel INT8U 
+ * @param panId INT16U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSetPendingNetworkUpdate( \
+  channel, \
+  panId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SET_PENDING_NETWORK_UPDATE_COMMAND_ID, \
+    "uu", \
+    channel, \
+    panId \
+  );
 
 /** @brief Command description for RequireApsAcksOnUnicasts
  *
  * Command: RequireApsAcksOnUnicasts
- * @param numberExemptClusters INT8U
+ * @param numberExemptClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRequireApsAcksOnUnicasts(numberExemptClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer(   \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, "ub", numberExemptClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterRequireApsAcksOnUnicasts( \
+  numberExemptClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REQUIRE_APS_ACKS_ON_UNICASTS_COMMAND_ID, \
+    "ub", \
+    numberExemptClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for RemoveApsAcksOnUnicastsRequirement
  *
  * Command: RemoveApsAcksOnUnicastsRequirement
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement()                                                                 \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterRemoveApsAcksOnUnicastsRequirement( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_REMOVE_APS_ACKS_ON_UNICASTS_REQUIREMENT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for ApsAckRequirementQuery
  *
  * Command: ApsAckRequirementQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterApsAckRequirementQuery() emberAfFillExternalBuffer(mask,                                             \
-                                                                                                                                   \
-                                                                                 ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterApsAckRequirementQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_APS_ACK_REQUIREMENT_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DebugReportQuery
  *
  * Command: DebugReportQuery
- * @param debugReportId INT8U
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDebugReportQuery(debugReportId)                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, "u", debugReportId);
+ * @param debugReportId INT8U 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterDebugReportQuery( \
+  debugReportId \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DEBUG_REPORT_QUERY_COMMAND_ID, \
+    "u", \
+    debugReportId \
+  );
 
 /** @brief Command description for SurveyBeacons
  *
  * Command: SurveyBeacons
- * @param standardBeacons BOOLEAN
- */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterSurveyBeacons(standardBeacons)                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_SURVEY_BEACONS_COMMAND_ID, "u", standardBeacons);
+ * @param standardBeacons BOOLEAN 
+ */
+#define emberAfFillCommandSL Works With All HubsClusterSurveyBeacons( \
+  standardBeacons \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_SURVEY_BEACONS_COMMAND_ID, \
+    "u", \
+    standardBeacons \
+  );
 
 /** @brief Command description for DisableOtaDowngrades
  *
  * Command: DisableOtaDowngrades
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableOtaDowngrades() emberAfFillExternalBuffer(mask,                                               \
-                                                                                                                                   \
-                                                                               ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableOtaDowngrades( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_OTA_DOWNGRADES_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableMgmtLeaveWithoutRejoin
  *
  * Command: DisableMgmtLeaveWithoutRejoin
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableMgmtLeaveWithoutRejoin()                                                                      \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableMgmtLeaveWithoutRejoin( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_MGMT_LEAVE_WITHOUT_REJOIN_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableTouchlinkInterpanMessageSupport
  *
  * Command: DisableTouchlinkInterpanMessageSupport
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableTouchlinkInterpanMessageSupport()                                                             \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableTouchlinkInterpanMessageSupport( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_TOUCHLINK_INTERPAN_MESSAGE_SUPPORT_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahParentClassification
  *
  * Command: EnableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahParentClassification()                                                                     \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahParentClassification
  *
  * Command: DisableWwahParentClassification
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahParentClassification()                                                                    \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahParentClassification( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_PARENT_CLASSIFICATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableTcSecurityOnNtwkKeyRotation
  *
  * Command: EnableTcSecurityOnNtwkKeyRotation
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation()                                                                  \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableTcSecurityOnNtwkKeyRotation( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_TC_SECURITY_ON_NTWK_KEY_ROTATION_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableWwahBadParentRecovery
  *
  * Command: EnableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableWwahBadParentRecovery()                                                                        \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableWwahBadParentRecovery
  *
  * Command: DisableWwahBadParentRecovery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableWwahBadParentRecovery()                                                                       \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableWwahBadParentRecovery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_WWAH_BAD_PARENT_RECOVERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for EnableConfigurationMode
  *
  * Command: EnableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterEnableConfigurationMode() emberAfFillExternalBuffer(mask,                                            \
-                                                                                                                                   \
-                                                                                  ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterEnableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_ENABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for DisableConfigurationMode
  *
  * Command: DisableConfigurationMode
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterDisableConfigurationMode()                                                                           \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterDisableConfigurationMode( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_DISABLE_CONFIGURATION_MODE_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServer
  *
  * Command: UseTrustCenterForClusterServer
- * @param numberOfClusters INT8U
+ * @param numberOfClusters INT8U 
  * @param clusterId CLUSTER_ID []
  * @param clusterIdLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServer(numberOfClusters, clusterId, clusterIdLen) emberAfFillExternalBuffer( \
-        mask,                                                                                                                      \
-                                                                                                                                   \
-        ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, "ub", numberOfClusters, clusterId, clusterIdLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServer( \
+  numberOfClusters, \
+  clusterId, clusterIdLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_COMMAND_ID, \
+    "ub", \
+    numberOfClusters, \
+    clusterId, clusterIdLen \
+  );
 
 /** @brief Command description for TrustCenterForClusterServerQuery
  *
  * Command: TrustCenterForClusterServerQuery
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterTrustCenterForClusterServerQuery()                                                                   \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, "", );
+#define emberAfFillCommandSL Works With All HubsClusterTrustCenterForClusterServerQuery( \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_TRUST_CENTER_FOR_CLUSTER_SERVER_QUERY_COMMAND_ID, \
+    "", \
+  );
 
 /** @brief Command description for UseTrustCenterForClusterServerResponse
  *
  * Command: UseTrustCenterForClusterServerResponse
- * @param status Status
- * @param clusterStatusLength INT8U
+ * @param status Status 
+ * @param clusterStatusLength INT8U 
  * @param clusterStatus WwahClusterStatusToUseTC []
  * @param clusterStatusLen int
  */
-#define emberAfFillCommandSL                                                                                                       \
-    Works With All HubsClusterUseTrustCenterForClusterServerResponse(status, clusterStatusLength, clusterStatus, clusterStatusLen) \
-        emberAfFillExternalBuffer(mask,                                                                                            \
-                                                                                                                                   \
-                                  ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, "uub", status, clusterStatusLength, \
-                                  clusterStatus, clusterStatusLen);
+#define emberAfFillCommandSL Works With All HubsClusterUseTrustCenterForClusterServerResponse( \
+  status, \
+  clusterStatusLength, \
+  clusterStatus, clusterStatusLen \
+) \
+  emberAfFillExternalBuffer( \
+    mask, \
+     \
+    ZCL_USE_TRUST_CENTER_FOR_CLUSTER_SERVER_RESPONSE_COMMAND_ID, \
+    "uub", \
+    status, \
+    clusterStatusLength, \
+    clusterStatus, clusterStatusLen \
+  );
diff --git a/src/darwin/Framework/CHIP/gen/cluster-id.h b/src/darwin/Framework/CHIP/gen/cluster-id.h
index f98f199f5a522a..a887c3fdc58d4c 100644
--- a/src/darwin/Framework/CHIP/gen/cluster-id.h
+++ b/src/darwin/Framework/CHIP/gen/cluster-id.h
@@ -20,380 +20,507 @@
 // Prevent multiple inclusion
 #pragma once
 
+
 // Definitions for cluster: Power Configuration
 #define ZCL_POWER_CONFIG_CLUSTER_ID (0x0001)
 
+
 // Definitions for cluster: Device Temperature Configuration
 #define ZCL_DEVICE_TEMP_CLUSTER_ID (0x0002)
 
+
 // Definitions for cluster: Identify
 #define ZCL_IDENTIFY_CLUSTER_ID (0x0003)
 
+
 // Definitions for cluster: Groups
 #define ZCL_GROUPS_CLUSTER_ID (0x0004)
 
+
 // Definitions for cluster: Scenes
 #define ZCL_SCENES_CLUSTER_ID (0x0005)
 
+
 // Definitions for cluster: On/off
 #define ZCL_ON_OFF_CLUSTER_ID (0x0006)
 
+
 // Definitions for cluster: On/off Switch Configuration
 #define ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID (0x0007)
 
+
 // Definitions for cluster: Level Control
 #define ZCL_LEVEL_CONTROL_CLUSTER_ID (0x0008)
 
+
 // Definitions for cluster: Alarms
 #define ZCL_ALARM_CLUSTER_ID (0x0009)
 
+
 // Definitions for cluster: Time
 #define ZCL_TIME_CLUSTER_ID (0x000A)
 
+
 // Definitions for cluster: RSSI Location
 #define ZCL_RSSI_LOCATION_CLUSTER_ID (0x000B)
 
+
 // Definitions for cluster: Binary Input (Basic)
 #define ZCL_BINARY_INPUT_BASIC_CLUSTER_ID (0x000F)
 
+
 // Definitions for cluster: Commissioning
 #define ZCL_COMMISSIONING_CLUSTER_ID (0x0015)
 
+
 // Definitions for cluster: Partition
 #define ZCL_PARTITION_CLUSTER_ID (0x0016)
 
+
 // Definitions for cluster: Over the Air Bootloading
 #define ZCL_OTA_BOOTLOAD_CLUSTER_ID (0x0019)
 
+
 // Definitions for cluster: Power Profile
 #define ZCL_POWER_PROFILE_CLUSTER_ID (0x001A)
 
+
 // Definitions for cluster: Appliance Control
 #define ZCL_APPLIANCE_CONTROL_CLUSTER_ID (0x001B)
 
+
 // Definitions for cluster: Descriptor
 #define ZCL_DESCRIPTOR_CLUSTER_ID (0x001D)
 
+
 // Definitions for cluster: Poll Control
 #define ZCL_POLL_CONTROL_CLUSTER_ID (0x0020)
 
+
 // Definitions for cluster: Green Power
 #define ZCL_GREEN_POWER_CLUSTER_ID (0x0021)
 
+
 // Definitions for cluster: Keep-Alive
 #define ZCL_KEEPALIVE_CLUSTER_ID (0x0025)
 
+
 // Definitions for cluster: Basic
 #define ZCL_BASIC_CLUSTER_ID (0x0028)
 
+
 // Definitions for cluster: General Commissioning
 #define ZCL_GENERAL_COMMISSIONING_CLUSTER_ID (0x0030)
 
+
 // Definitions for cluster: Network Commissioning
 #define ZCL_NETWORK_COMMISSIONING_CLUSTER_ID (0x0031)
 
+
 // Definitions for cluster: Shade Configuration
 #define ZCL_SHADE_CONFIG_CLUSTER_ID (0x0100)
 
+
 // Definitions for cluster: Door Lock
 #define ZCL_DOOR_LOCK_CLUSTER_ID (0x0101)
 
+
 // Definitions for cluster: Window Covering
 #define ZCL_WINDOW_COVERING_CLUSTER_ID (0x0102)
 
+
 // Definitions for cluster: Barrier Control
 #define ZCL_BARRIER_CONTROL_CLUSTER_ID (0x0103)
 
+
 // Definitions for cluster: Pump Configuration and Control
 #define ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID (0x0200)
 
+
 // Definitions for cluster: Thermostat
 #define ZCL_THERMOSTAT_CLUSTER_ID (0x0201)
 
+
 // Definitions for cluster: Fan Control
 #define ZCL_FAN_CONTROL_CLUSTER_ID (0x0202)
 
+
 // Definitions for cluster: Dehumidification Control
 #define ZCL_DEHUMID_CONTROL_CLUSTER_ID (0x0203)
 
+
 // Definitions for cluster: Thermostat User Interface Configuration
 #define ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID (0x0204)
 
+
 // Definitions for cluster: Color Control
 #define ZCL_COLOR_CONTROL_CLUSTER_ID (0x0300)
 
+
 // Definitions for cluster: Ballast Configuration
 #define ZCL_BALLAST_CONFIGURATION_CLUSTER_ID (0x0301)
 
+
 // Definitions for cluster: Illuminance Measurement
 #define ZCL_ILLUM_MEASUREMENT_CLUSTER_ID (0x0400)
 
+
 // Definitions for cluster: Illuminance Level Sensing
 #define ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID (0x0401)
 
+
 // Definitions for cluster: Temperature Measurement
 #define ZCL_TEMP_MEASUREMENT_CLUSTER_ID (0x0402)
 
+
 // Definitions for cluster: Pressure Measurement
 #define ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID (0x0403)
 
+
 // Definitions for cluster: Flow Measurement
 #define ZCL_FLOW_MEASUREMENT_CLUSTER_ID (0x0404)
 
+
 // Definitions for cluster: Relative Humidity Measurement
 #define ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID (0x0405)
 
+
 // Definitions for cluster: Occupancy Sensing
 #define ZCL_OCCUPANCY_SENSING_CLUSTER_ID (0x0406)
 
+
 // Definitions for cluster: Carbon Monoxide Concentration Measurement
 #define ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040C)
 
+
 // Definitions for cluster: Carbon Dioxide Concentration Measurement
 #define ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040D)
 
+
 // Definitions for cluster: Ethylene Concentration Measurement
 #define ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040E)
 
+
 // Definitions for cluster: Ethylene Oxide Concentration Measurement
 #define ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x040F)
 
+
 // Definitions for cluster: Hydrogen Concentration Measurement
 #define ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0410)
 
+
 // Definitions for cluster: Hydrogen Sulphide Concentration Measurement
 #define ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0411)
 
+
 // Definitions for cluster: Nitric Oxide Concentration Measurement
 #define ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0412)
 
+
 // Definitions for cluster: Nitrogen Dioxide Concentration Measurement
 #define ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0413)
 
+
 // Definitions for cluster: Oxygen Concentration Measurement
 #define ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0414)
 
+
 // Definitions for cluster: Ozone Concentration Measurement
 #define ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0415)
 
+
 // Definitions for cluster: Sulfur Dioxide Concentration Measurement
 #define ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0416)
 
+
 // Definitions for cluster: Dissolved Oxygen Concentration Measurement
 #define ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0417)
 
+
 // Definitions for cluster: Bromate Concentration Measurement
 #define ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0418)
 
+
 // Definitions for cluster: Chloramines Concentration Measurement
 #define ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0419)
 
+
 // Definitions for cluster: Chlorine Concentration Measurement
 #define ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041A)
 
+
 // Definitions for cluster: Fecal coliform and E. Coli Concentration Measurement
 #define ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041B)
 
+
 // Definitions for cluster: Fluoride Concentration Measurement
 #define ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041C)
 
+
 // Definitions for cluster: Haloacetic Acids Concentration Measurement
 #define ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041D)
 
+
 // Definitions for cluster: Total Trihalomethanes Concentration Measurement
 #define ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041E)
 
+
 // Definitions for cluster: Total Coliform Bacteria Concentration Measurement
 #define ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x041F)
 
+
 // Definitions for cluster: Turbidity Concentration Measurement
 #define ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0420)
 
+
 // Definitions for cluster: Copper Concentration Measurement
 #define ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0421)
 
+
 // Definitions for cluster: Lead Concentration Measurement
 #define ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0422)
 
+
 // Definitions for cluster: Manganese Concentration Measurement
 #define ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0423)
 
+
 // Definitions for cluster: Sulfate Concentration Measurement
 #define ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0424)
 
+
 // Definitions for cluster: Bromodichloromethane Concentration Measurement
 #define ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0425)
 
+
 // Definitions for cluster: Bromoform Concentration Measurement
 #define ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0426)
 
+
 // Definitions for cluster: Chlorodibromomethane Concentration Measurement
 #define ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0427)
 
+
 // Definitions for cluster: Chloroform Concentration Measurement
 #define ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0428)
 
+
 // Definitions for cluster: Sodium Concentration Measurement
 #define ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID (0x0429)
 
+
 // Definitions for cluster: IAS Zone
 #define ZCL_IAS_ZONE_CLUSTER_ID (0x0500)
 
+
 // Definitions for cluster: IAS ACE
 #define ZCL_IAS_ACE_CLUSTER_ID (0x0501)
 
+
 // Definitions for cluster: IAS WD
 #define ZCL_IAS_WD_CLUSTER_ID (0x0502)
 
+
 // Definitions for cluster: Wake on LAN
 #define ZCL_WAKE_ON_LAN_CLUSTER_ID (0x0503)
 
+
 // Definitions for cluster: TV Channel
 #define ZCL_TV_CHANNEL_CLUSTER_ID (0x0504)
 
+
 // Definitions for cluster: Target Navigator
 #define ZCL_TARGET_NAVIGATOR_CLUSTER_ID (0x0505)
 
+
 // Definitions for cluster: Media Playback
 #define ZCL_MEDIA_PLAYBACK_CLUSTER_ID (0x0506)
 
+
 // Definitions for cluster: Media Input
 #define ZCL_MEDIA_INPUT_CLUSTER_ID (0x0507)
 
+
 // Definitions for cluster: Low Power
 #define ZCL_LOW_POWER_CLUSTER_ID (0x0508)
 
+
 // Definitions for cluster: Keypad Input
 #define ZCL_KEYPAD_INPUT_CLUSTER_ID (0x0509)
 
+
 // Definitions for cluster: Content Launch
 #define ZCL_CONTENT_LAUNCH_CLUSTER_ID (0x050A)
 
+
 // Definitions for cluster: Audio Output
 #define ZCL_AUDIO_OUTPUT_CLUSTER_ID (0x050B)
 
+
 // Definitions for cluster: Application Launcher
 #define ZCL_APPLICATION_LAUNCHER_CLUSTER_ID (0x050C)
 
+
 // Definitions for cluster: Application Basic
 #define ZCL_APPLICATION_BASIC_CLUSTER_ID (0x050D)
 
+
 // Definitions for cluster: Account Login
 #define ZCL_ACCOUNT_LOGIN_CLUSTER_ID (0x050E)
 
+
 // Definitions for cluster: Generic Tunnel
 #define ZCL_GENERIC_TUNNEL_CLUSTER_ID (0x0600)
 
+
 // Definitions for cluster: BACnet Protocol Tunnel
 #define ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID (0x0601)
 
+
 // Definitions for cluster: 11073 Protocol Tunnel
 #define ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID (0x0614)
 
+
 // Definitions for cluster: ISO 7816 Protocol Tunnel
 #define ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID (0x0615)
 
+
 // Definitions for cluster: Price
 #define ZCL_PRICE_CLUSTER_ID (0x0700)
 
+
 // Definitions for cluster: Demand Response and Load Control
 #define ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID (0x0701)
 
+
 // Definitions for cluster: Simple Metering
 #define ZCL_SIMPLE_METERING_CLUSTER_ID (0x0702)
 
+
 // Definitions for cluster: Messaging
 #define ZCL_MESSAGING_CLUSTER_ID (0x0703)
 
+
 // Definitions for cluster: Tunneling
 #define ZCL_TUNNELING_CLUSTER_ID (0x0704)
 
+
 // Definitions for cluster: Prepayment
 #define ZCL_PREPAYMENT_CLUSTER_ID (0x0705)
 
+
 // Definitions for cluster: Energy Management
 #define ZCL_ENERGY_MANAGEMENT_CLUSTER_ID (0x0706)
 
+
 // Definitions for cluster: Calendar
 #define ZCL_CALENDAR_CLUSTER_ID (0x0707)
 
+
 // Definitions for cluster: Device Management
 #define ZCL_DEVICE_MANAGEMENT_CLUSTER_ID (0x0708)
 
+
 // Definitions for cluster: Events
 #define ZCL_EVENTS_CLUSTER_ID (0x0709)
 
+
 // Definitions for cluster: MDU Pairing
 #define ZCL_MDU_PAIRING_CLUSTER_ID (0x070A)
 
+
 // Definitions for cluster: Sub-GHz
 #define ZCL_SUB_GHZ_CLUSTER_ID (0x070B)
 
+
 // Definitions for cluster: Key Establishment
 #define ZCL_KEY_ESTABLISHMENT_CLUSTER_ID (0x0800)
 
+
 // Definitions for cluster: Information
 #define ZCL_INFORMATION_CLUSTER_ID (0x0900)
 
+
 // Definitions for cluster: Data Sharing
 #define ZCL_DATA_SHARING_CLUSTER_ID (0x0901)
 
+
 // Definitions for cluster: Gaming
 #define ZCL_GAMING_CLUSTER_ID (0x0902)
 
+
 // Definitions for cluster: Data Rate Control
 #define ZCL_DATA_RATE_CONTROL_CLUSTER_ID (0x0903)
 
+
 // Definitions for cluster: Voice over ZigBee
 #define ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID (0x0904)
 
+
 // Definitions for cluster: Chatting
 #define ZCL_CHATTING_CLUSTER_ID (0x0905)
 
+
 // Definitions for cluster: Payment
 #define ZCL_PAYMENT_CLUSTER_ID (0x0A01)
 
+
 // Definitions for cluster: Billing
 #define ZCL_BILLING_CLUSTER_ID (0x0A02)
 
+
 // Definitions for cluster: Appliance Identification
 #define ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID (0x0B00)
 
+
 // Definitions for cluster: Meter Identification
 #define ZCL_METER_IDENTIFICATION_CLUSTER_ID (0x0B01)
 
+
 // Definitions for cluster: Appliance Events and Alert
 #define ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID (0x0B02)
 
+
 // Definitions for cluster: Appliance Statistics
 #define ZCL_APPLIANCE_STATISTICS_CLUSTER_ID (0x0B03)
 
+
 // Definitions for cluster: Electrical Measurement
 #define ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID (0x0B04)
 
+
 // Definitions for cluster: Diagnostics
 #define ZCL_DIAGNOSTICS_CLUSTER_ID (0x0B05)
 
+
 // Definitions for cluster: ZLL Commissioning
 #define ZCL_ZLL_COMMISSIONING_CLUSTER_ID (0x1000)
 
+
 // Definitions for cluster: Binding
 #define ZCL_BINDING_CLUSTER_ID (0xF000)
 
+
 // Definitions for cluster: Group Key Management
 #define ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID (0xF004)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID (0xFC00)
 
+
 // Definitions for cluster: Sample Mfg Specific Cluster 2
 #define ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID (0xFC00)
 
+
 // Definitions for cluster: Configuration Cluster
 #define ZCL_OTA_CONFIGURATION_CLUSTER_ID (0xFC01)
 
+
 // Definitions for cluster: MFGLIB Cluster
 #define ZCL_MFGLIB_CLUSTER_ID (0xFC02)
 
+
 // Definitions for cluster: SL Works With All Hubs
 #define ZCL_SL_WWAH_CLUSTER_ID (0xFC57)
+
diff --git a/src/darwin/Framework/CHIP/gen/command-id.h b/src/darwin/Framework/CHIP/gen/command-id.h
index 6df1947fa80ac6..351da40769f63c 100644
--- a/src/darwin/Framework/CHIP/gen/command-id.h
+++ b/src/darwin/Framework/CHIP/gen/command-id.h
@@ -45,6 +45,9 @@
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_COMMAND_ID (0x15)
 #define ZCL_DISCOVER_ATTRIBUTES_EXTENDED_RESPONSE_COMMAND_ID (0x16)
 
+
+
+
 // Commands for cluster: Identify
 #define ZCL_IDENTIFY_COMMAND_ID (0x00)
 #define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00)
@@ -99,6 +102,7 @@
 #define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
 #define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
 
+
 // Commands for cluster: Level Control
 #define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
 #define ZCL_MOVE_COMMAND_ID (0x01)
@@ -117,6 +121,7 @@
 #define ZCL_GET_ALARM_COMMAND_ID (0x02)
 #define ZCL_RESET_ALARM_LOG_COMMAND_ID (0x03)
 
+
 // Commands for cluster: RSSI Location
 #define ZCL_SET_ABSOLUTE_LOCATION_COMMAND_ID (0x00)
 #define ZCL_DEVICE_CONFIGURATION_RESPONSE_COMMAND_ID (0x00)
@@ -134,6 +139,7 @@
 #define ZCL_REPORT_RSSI_MEASUREMENTS_COMMAND_ID (0x06)
 #define ZCL_REQUEST_OWN_LOCATION_COMMAND_ID (0x07)
 
+
 // Commands for cluster: Commissioning
 #define ZCL_RESTART_DEVICE_COMMAND_ID (0x00)
 #define ZCL_RESTART_DEVICE_RESPONSE_COMMAND_ID (0x00)
@@ -196,6 +202,7 @@
 #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04)
 #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05)
 
+
 // Commands for cluster: Poll Control
 #define ZCL_CHECK_IN_COMMAND_ID (0x00)
 #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00)
@@ -222,6 +229,7 @@
 #define ZCL_GP_PROXY_TABLE_RESPONSE_COMMAND_ID (0x0B)
 #define ZCL_GP_PROXY_TABLE_REQUEST_COMMAND_ID (0x0B)
 
+
 // Commands for cluster: Basic
 #define ZCL_START_UP_COMMAND_ID (0x00)
 #define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
@@ -257,6 +265,7 @@
 #define ZCL_DISABLE_NETWORK_RESPONSE_COMMAND_ID (0x0F)
 #define ZCL_GET_LAST_NETWORK_COMMISSIONING_RESULT_COMMAND_ID (0x10)
 
+
 // Commands for cluster: Door Lock
 #define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
 #define ZCL_LOCK_DOOR_RESPONSE_COMMAND_ID (0x00)
@@ -326,6 +335,7 @@
 #define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
 #define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Thermostat
 #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
 #define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00)
@@ -335,6 +345,9 @@
 #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
 #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04)
 
+
+
+
 // Commands for cluster: Color Control
 #define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
 #define ZCL_MOVE_HUE_COMMAND_ID (0x01)
@@ -356,6 +369,44 @@
 #define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
 #define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // Commands for cluster: IAS Zone
 #define ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID (0x00)
 #define ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID (0x00)
@@ -390,6 +441,7 @@
 #define ZCL_START_WARNING_COMMAND_ID (0x00)
 #define ZCL_SQUAWK_COMMAND_ID (0x01)
 
+
 // Commands for cluster: TV Channel
 #define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
 #define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x00)
@@ -440,6 +492,7 @@
 #define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
 #define ZCL_LAUNCH_APP_RESPONSE_COMMAND_ID (0x00)
 
+
 // Commands for cluster: Account Login
 #define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
 #define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x00)
@@ -731,6 +784,8 @@
 #define ZCL_BILL_STATUS_NOTIFICATION_COMMAND_ID (0x04)
 #define ZCL_SESSION_KEEP_ALIVE_COMMAND_ID (0x05)
 
+
+
 // Commands for cluster: Appliance Events and Alert
 #define ZCL_GET_ALERTS_COMMAND_ID (0x00)
 #define ZCL_GET_ALERTS_RESPONSE_COMMAND_ID (0x00)
@@ -751,6 +806,7 @@
 #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
 #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: ZLL Commissioning
 #define ZCL_SCAN_REQUEST_COMMAND_ID (0x00)
 #define ZCL_SCAN_RESPONSE_COMMAND_ID (0x01)
@@ -775,6 +831,7 @@
 #define ZCL_BIND_COMMAND_ID (0x00)
 #define ZCL_UNBIND_COMMAND_ID (0x01)
 
+
 // Commands for cluster: Sample Mfg Specific Cluster
 #define ZCL_COMMAND_ONE_COMMAND_ID (0x00)
 
diff --git a/src/darwin/Framework/CHIP/gen/endpoint_config.h b/src/darwin/Framework/CHIP/gen/endpoint_config.h
index 7f78df5818c6b8..7be9f5f8725a3c 100644
--- a/src/darwin/Framework/CHIP/gen/endpoint_config.h
+++ b/src/darwin/Framework/CHIP/gen/endpoint_config.h
@@ -20,133 +20,94 @@
 // Prevent multiple inclusion
 #pragma once
 
+
+
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob
 // Separate block is generated for big-endian and little-endian cases.
 #if BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+}
+
 
 #else // !BIGENDIAN_CPU
-#define GENERATED_DEFAULTS                                                                                                         \
-    {                                                                                                                              \
-    }
+#define GENERATED_DEFAULTS { \
+}
 
 #endif // BIGENDIAN_CPU
 
 #define GENERATED_DEFAULTS_COUNT (0)
 
-#define ZAP_TYPE(type) ZCL_##type##_ATTRIBUTE_TYPE
-#define ZAP_LONG_DEFAULTS_INDEX(index)                                                                                             \
-    {                                                                                                                              \
-        (uint8_t *) (&generatedDefaults[index])                                                                                    \
-    }
-#define ZAP_MIN_MAX_DEFAULTS_INDEX(index)                                                                                          \
-    {                                                                                                                              \
-        (uint8_t *) (&minMaxDefault[index])                                                                                        \
-    }
-#define ZAP_EMPTY_DEFAULT()                                                                                                        \
-    {                                                                                                                              \
-        (uint8_t *) 0                                                                                                              \
-    }
-#define ZAP_SIMPLE_DEFAULT(x)                                                                                                      \
-    {                                                                                                                              \
-        (uint8_t *) x                                                                                                              \
-    }
+#define ZAP_TYPE(type) ZCL_ ## type ## _ATTRIBUTE_TYPE
+#define ZAP_LONG_DEFAULTS_INDEX(index) {(uint8_t*)(&generatedDefaults[index])}
+#define ZAP_MIN_MAX_DEFAULTS_INDEX(index) {(uint8_t*)(&minMaxDefault[index])}
+#define ZAP_EMPTY_DEFAULT() {(uint8_t*) 0}
+#define ZAP_SIMPLE_DEFAULT(x) {(uint8_t *) x}
 
 // This is an array of EmberAfAttributeMinMaxValue structures.
 #define GENERATED_MIN_MAX_DEFAULT_COUNT 0
-#define GENERATED_MIN_MAX_DEFAULTS                                                                                                 \
-    {                                                                                                                              \
-    }
+#define GENERATED_MIN_MAX_DEFAULTS { \
+}
 
-#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask
+
+#define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_ ## mask
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT 14
-#define GENERATED_ATTRIBUTES                                                                                                       \
-    {                                                                                                                              \
-        { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                                 \
-          ZAP_SIMPLE_DEFAULT(2) }, /* Identify (client): cluster revision */                                                       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Groups (client): cluster revision */                                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Scenes (client): cluster revision */                                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(2) }, /* On/off (client): cluster revision */                                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (client): cluster revision */                                              \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT) | ZAP_ATTRIBUTE_MASK(SINGLETON),                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Basic (client): cluster revision */                                                      \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* General Commissioning (client): cluster revision */                                 \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (client): cluster revision */                                                  \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (client): cluster revision */                                       \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Color Control (client): cluster revision */                                              \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (client): cluster revision */                                    \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Low Power (client): cluster revision */                                             \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (client): cluster revision */                                     \
-            { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT),                                                             \
-              ZAP_SIMPLE_DEFAULT(0x0001) }, /* Binding (client): cluster revision */                                               \
-    }
+#define GENERATED_ATTRIBUTES { \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(2) }, /* Identify (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Groups (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Scenes (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(2) }, /* On/off (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Level Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT) | ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(3) }, /* Basic (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* General Commissioning (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Door Lock (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Barrier Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Color Control (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* Temperature Measurement (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Low Power (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Application Basic (client): cluster revision */  \
+  { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* Binding (client): cluster revision */  \
+}
+
 
 // This is an array of EmberAfCluster structures.
-#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *) (&generatedAttributes[index]))
+#define ZAP_ATTRIBUTE_INDEX(index) ((EmberAfAttributeMetadata *)(&generatedAttributes[index]))
 
 // Cluster function static arrays
-#define GENERATED_FUNCTION_ARRAYS
+#define GENERATED_FUNCTION_ARRAYS   \
 
-#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask
+
+
+#define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_ ## mask
 #define GENERATED_CLUSTER_COUNT 14
-#define GENERATED_CLUSTERS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003, ZAP_ATTRIBUTE_INDEX(0), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Identify (client) */    \
-            { 0x0004, ZAP_ATTRIBUTE_INDEX(1), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Groups (client) */  \
-            { 0x0005, ZAP_ATTRIBUTE_INDEX(2), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Scenes (client) */  \
-            { 0x0006, ZAP_ATTRIBUTE_INDEX(3), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: On/off (client) */  \
-            {                                                                                                                      \
-                0x0008, ZAP_ATTRIBUTE_INDEX(4), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Level Control (client) */                                                                  \
-            { 0x0028, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Basic (client) */   \
-            {                                                                                                                      \
-                0x0030, ZAP_ATTRIBUTE_INDEX(6), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: General Commissioning (client) */                                                          \
-            {                                                                                                                      \
-                0x0101, ZAP_ATTRIBUTE_INDEX(7), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Door Lock (client) */                                                                      \
-            {                                                                                                                      \
-                0x0103, ZAP_ATTRIBUTE_INDEX(8), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Barrier Control (client) */                                                                \
-            {                                                                                                                      \
-                0x0300, ZAP_ATTRIBUTE_INDEX(9), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                               \
-            }, /* Endpoint: 1, Cluster: Color Control (client) */                                                                  \
-            {                                                                                                                      \
-                0x0402, ZAP_ATTRIBUTE_INDEX(10), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */                                                        \
-            {                                                                                                                      \
-                0x0508, ZAP_ATTRIBUTE_INDEX(11), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Low Power (client) */                                                                      \
-            {                                                                                                                      \
-                0x050D, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Application Basic (client) */                                                              \
-            {                                                                                                                      \
-                0xF000, ZAP_ATTRIBUTE_INDEX(13), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL                                              \
-            }, /* Endpoint: 1, Cluster: Binding (client) */                                                                        \
-    }
-
-#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index]))
+#define GENERATED_CLUSTERS { \
+  { 0x0003, ZAP_ATTRIBUTE_INDEX(0), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Identify (client) */ \
+  { 0x0004, ZAP_ATTRIBUTE_INDEX(1), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Groups (client) */ \
+  { 0x0005, ZAP_ATTRIBUTE_INDEX(2), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Scenes (client) */ \
+  { 0x0006, ZAP_ATTRIBUTE_INDEX(3), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: On/off (client) */ \
+  { 0x0008, ZAP_ATTRIBUTE_INDEX(4), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Level Control (client) */ \
+  { 0x0028, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Basic (client) */ \
+  { 0x0030, ZAP_ATTRIBUTE_INDEX(6), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: General Commissioning (client) */ \
+  { 0x0101, ZAP_ATTRIBUTE_INDEX(7), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Door Lock (client) */ \
+  { 0x0103, ZAP_ATTRIBUTE_INDEX(8), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Barrier Control (client) */ \
+  { 0x0300, ZAP_ATTRIBUTE_INDEX(9), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Color Control (client) */ \
+  { 0x0402, ZAP_ATTRIBUTE_INDEX(10), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \
+  { 0x0508, ZAP_ATTRIBUTE_INDEX(11), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Low Power (client) */ \
+  { 0x050D, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Application Basic (client) */ \
+  { 0xF000, ZAP_ATTRIBUTE_INDEX(13), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Binding (client) */ \
+}
+
+
+#define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster*)(&generatedClusters[index]))
+
 
 // This is an array of EmberAfEndpointType structures.
-#define GENERATED_ENDPOINT_TYPES                                                                                                   \
-    {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 14, 28 },                                                                                          \
-    }
+#define GENERATED_ENDPOINT_TYPES { \
+  { ZAP_CLUSTER_INDEX(0), 14, 28 }, \
+}
+
+
 
 // Largest attribute size is needed for various buffers
 #define ATTRIBUTE_LARGEST (3)
@@ -162,274 +123,168 @@
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0001                                                                                                                     \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0001 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0103                                                                                                                     \
-    }
+#define FIXED_PROFILE_IDS { 0x0103 }
 
 // Array of device ids
-#define FIXED_DEVICE_IDS                                                                                                           \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_DEVICE_IDS { 0 }
 
 // Array of device versions
-#define FIXED_DEVICE_VERSIONS                                                                                                      \
-    {                                                                                                                              \
-        1                                                                                                                          \
-    }
+#define FIXED_DEVICE_VERSIONS { 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_ENDPOINT_TYPES { 0 }
 
 // Array of networks supported on each endpoint
-#define FIXED_NETWORKS                                                                                                             \
-    {                                                                                                                              \
-        0                                                                                                                          \
-    }
+#define FIXED_NETWORKS { 0 }
+
 
 // Array of EmberAfCommandMetadata structs.
-#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_##mask
+#define ZAP_COMMAND_MASK(mask) COMMAND_MASK_ ## mask
 #define EMBER_AF_GENERATED_COMMAND_COUNT (114)
-#define GENERATED_COMMANDS                                                                                                         \
-    {                                                                                                                              \
-        { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) },     /* Identify (client): Identify */                                 \
-            { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (client): IdentifyQueryResponse */                    \
-            { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (client): IdentifyQuery */                            \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroup */                                   \
-            { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): AddGroupResponse */                           \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): ViewGroup */                                  \
-            { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): ViewGroupResponse */                          \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): GetGroupMembership */                         \
-            { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): GetGroupMembershipResponse */                 \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveGroup */                                \
-            { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): RemoveGroupResponse */                        \
-            { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveAllGroups */                            \
-            { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroupIfIdentifying */                      \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): AddScene */                                   \
-            { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): AddSceneResponse */                           \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): ViewScene */                                  \
-            { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): ViewSceneResponse */                          \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveScene */                                \
-            { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveSceneResponse */                        \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveAllScenes */                            \
-            { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveAllScenesResponse */                    \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): StoreScene */                                 \
-            { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): StoreSceneResponse */                         \
-            { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RecallScene */                                \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): GetSceneMembership */                         \
-            { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): GetSceneMembershipResponse */                 \
-            { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Off */                                        \
-            { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): On */                                         \
-            { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Toggle */                                     \
-            { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevel */                         \
-            { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Move */                                \
-            { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Step */                                \
-            { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Stop */                                \
-            { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevelWithOnOff */                \
-            { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveWithOnOff */                       \
-            { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StepWithOnOff */                       \
-            { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StopWithOnOff */                       \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Basic (client): MfgSpecificPing */                             \
-            { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): StartUp */                                     \
-            { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): ShutDown */                                    \
-            { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): Leave */                                       \
-            { 0x0030, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): SetFabric */                   \
-            { 0x0030, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): SetFabricResponse */           \
-            { 0x0030, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): ArmFailSafe */                 \
-            { 0x0030, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): ArmFailSafeResponse */         \
-            { 0x0030, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): CommissioningComplete */       \
-            { 0x0030, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): CommissioningCompleteResponse */             \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): LockDoor */                                \
-            { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): LockDoorResponse */                        \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): UnlockDoor */                              \
-            { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): UnlockDoorResponse */                      \
-            { 0x0101, 0x03,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeout */ \
-            {                                                                                                                      \
-                0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): UnlockWithTimeoutResponse */                                                                 \
-            { 0x0101, 0x04,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecord */      \
-            {                                                                                                                      \
-                0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetLogRecordResponse */                                                                      \
-            { 0x0101, 0x05,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPin */            \
-            { 0x0101, 0x05,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPinResponse */    \
-            { 0x0101, 0x06,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPin */            \
-            { 0x0101, 0x06,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPinResponse */    \
-            { 0x0101, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPin */          \
-            { 0x0101, 0x07,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPinResponse */  \
-            { 0x0101, 0x08,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPins */      \
-            {                                                                                                                      \
-                0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                   /* Door Lock (client): ClearAllPinsResponse */                                                    \
-            { 0x0101, 0x09, 0 }, /* Door Lock (client): SetUserStatusResponse */                                                   \
-            { 0x0101, 0x0A, 0 }, /* Door Lock (client): GetUserStatusResponse */                                                   \
-            {                                                                                                                      \
-                0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetWeekdayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetWeekdaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetWeekdayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearWeekdaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearWeekdayScheduleResponse */                                                              \
-            {                                                                                                                      \
-                0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetYeardayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetYeardaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetYeardayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearYeardaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearYeardayScheduleResponse */                                                              \
-            {                                                                                                                      \
-                0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetHolidayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetHolidaySchedule */                                                                        \
-            {                                                                                                                      \
-                0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetHolidayScheduleResponse */                                                                \
-            {                                                                                                                      \
-                0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearHolidaySchedule */                                                                      \
-            {                                                                                                                      \
-                0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): ClearHolidayScheduleResponse */                                                              \
-            { 0x0101, 0x14,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserType */       \
-            {                                                                                                                      \
-                0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): SetUserTypeResponse */                                                                       \
-            { 0x0101, 0x15,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserType */       \
-            {                                                                                                                      \
-                0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Door Lock (client): GetUserTypeResponse */                                                                       \
-            { 0x0101, 0x16,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfid */           \
-            { 0x0101, 0x16,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfidResponse */   \
-            { 0x0101, 0x17,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfid */           \
-            { 0x0101, 0x17,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfidResponse */   \
-            { 0x0101, 0x18,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfid */         \
-            { 0x0101, 0x18,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfidResponse */ \
-            { 0x0101, 0x19,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfids */     \
-            {                                                                                                                      \
-                0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                                                   /* Door Lock (client): ClearAllRfidsResponse */                   \
-            { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlGoToPercent */         \
-            { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlStop */                \
-            { 0x0300, 0x00,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHue */     \
-            { 0x0300, 0x01,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveHue */       \
-            { 0x0300, 0x02,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepHue */       \
-            {                                                                                                                      \
-                0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveToSaturation */                                                                      \
-            {                                                                                                                      \
-                0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): StepSaturation */                                                                        \
-            {                                                                                                                      \
-                0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                                                   /* Color Control (client): MoveToHueAndSaturation */              \
-            { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveToColor */                         \
-            { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveColor */                           \
-            { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): StepColor */                           \
-            {                                                                                                                      \
-                0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveToColorTemperature */                                                                \
-            { 0x0300, 0x47,                                                                                                        \
-              ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StopMoveStep */  \
-            {                                                                                                                      \
-                0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            }, /* Color Control (client): MoveColorTemperature */                                                                  \
-            {                                                                                                                      \
-                0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT)                                \
-            },                                                   /* Color Control (client): StepColorTemperature */                \
-            { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (client): Sleep */                                   \
-            { 0xF000, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Bind */                                      \
-            { 0xF000, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Unbind */                                    \
-    }
+#define GENERATED_COMMANDS { \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (client): Identify */ \
+  { 0x0003, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Identify (client): IdentifyQueryResponse */ \
+  { 0x0003, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Identify (client): IdentifyQuery */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroup */ \
+  { 0x0004, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): AddGroupResponse */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): ViewGroup */ \
+  { 0x0004, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): ViewGroupResponse */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): GetGroupMembership */ \
+  { 0x0004, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): GetGroupMembershipResponse */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveGroup */ \
+  { 0x0004, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Groups (client): RemoveGroupResponse */ \
+  { 0x0004, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): RemoveAllGroups */ \
+  { 0x0004, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Groups (client): AddGroupIfIdentifying */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): AddScene */ \
+  { 0x0005, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): AddSceneResponse */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): ViewScene */ \
+  { 0x0005, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): ViewSceneResponse */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveScene */ \
+  { 0x0005, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveSceneResponse */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RemoveAllScenes */ \
+  { 0x0005, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): RemoveAllScenesResponse */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): StoreScene */ \
+  { 0x0005, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): StoreSceneResponse */ \
+  { 0x0005, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): RecallScene */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Scenes (client): GetSceneMembership */ \
+  { 0x0005, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Scenes (client): GetSceneMembershipResponse */ \
+  { 0x0006, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Off */ \
+  { 0x0006, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): On */ \
+  { 0x0006, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* On/off (client): Toggle */ \
+  { 0x0008, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevel */ \
+  { 0x0008, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Move */ \
+  { 0x0008, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Step */ \
+  { 0x0008, 0x03, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): Stop */ \
+  { 0x0008, 0x04, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveToLevelWithOnOff */ \
+  { 0x0008, 0x05, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): MoveWithOnOff */ \
+  { 0x0008, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StepWithOnOff */ \
+  { 0x0008, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Level Control (client): StopWithOnOff */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Basic (client): MfgSpecificPing */ \
+  { 0x0028, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): StartUp */ \
+  { 0x0028, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): ShutDown */ \
+  { 0x0028, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Basic (client): Leave */ \
+  { 0x0030, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): SetFabric */ \
+  { 0x0030, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): SetFabricResponse */ \
+  { 0x0030, 0x02, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): ArmFailSafe */ \
+  { 0x0030, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): ArmFailSafeResponse */ \
+  { 0x0030, 0x06, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* General Commissioning (client): CommissioningComplete */ \
+  { 0x0030, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* General Commissioning (client): CommissioningCompleteResponse */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): LockDoor */ \
+  { 0x0101, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): LockDoorResponse */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Door Lock (client): UnlockDoor */ \
+  { 0x0101, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) }, /* Door Lock (client): UnlockDoorResponse */ \
+  { 0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeout */ \
+  { 0x0101, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): UnlockWithTimeoutResponse */ \
+  { 0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecord */ \
+  { 0x0101, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetLogRecordResponse */ \
+  { 0x0101, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPin */ \
+  { 0x0101, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetPinResponse */ \
+  { 0x0101, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPin */ \
+  { 0x0101, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetPinResponse */ \
+  { 0x0101, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPin */ \
+  { 0x0101, 0x07, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearPinResponse */ \
+  { 0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPins */ \
+  { 0x0101, 0x08, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllPinsResponse */ \
+  { 0x0101, 0x09, 0 }, /* Door Lock (client): SetUserStatusResponse */ \
+  { 0x0101, 0x0A, 0 }, /* Door Lock (client): GetUserStatusResponse */ \
+  { 0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetWeekdaySchedule */ \
+  { 0x0101, 0x0B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetWeekdayScheduleResponse */ \
+  { 0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetWeekdaySchedule */ \
+  { 0x0101, 0x0C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetWeekdayScheduleResponse */ \
+  { 0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearWeekdaySchedule */ \
+  { 0x0101, 0x0D, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearWeekdayScheduleResponse */ \
+  { 0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetYeardaySchedule */ \
+  { 0x0101, 0x0E, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetYeardayScheduleResponse */ \
+  { 0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetYeardaySchedule */ \
+  { 0x0101, 0x0F, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetYeardayScheduleResponse */ \
+  { 0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearYeardaySchedule */ \
+  { 0x0101, 0x10, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearYeardayScheduleResponse */ \
+  { 0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetHolidaySchedule */ \
+  { 0x0101, 0x11, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetHolidayScheduleResponse */ \
+  { 0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetHolidaySchedule */ \
+  { 0x0101, 0x12, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetHolidayScheduleResponse */ \
+  { 0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearHolidaySchedule */ \
+  { 0x0101, 0x13, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearHolidayScheduleResponse */ \
+  { 0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserType */ \
+  { 0x0101, 0x14, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetUserTypeResponse */ \
+  { 0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserType */ \
+  { 0x0101, 0x15, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetUserTypeResponse */ \
+  { 0x0101, 0x16, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfid */ \
+  { 0x0101, 0x16, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): SetRfidResponse */ \
+  { 0x0101, 0x17, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfid */ \
+  { 0x0101, 0x17, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): GetRfidResponse */ \
+  { 0x0101, 0x18, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfid */ \
+  { 0x0101, 0x18, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearRfidResponse */ \
+  { 0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfids */ \
+  { 0x0101, 0x19, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Door Lock (client): ClearAllRfidsResponse */ \
+  { 0x0103, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlGoToPercent */ \
+  { 0x0103, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Barrier Control (client): BarrierControlStop */ \
+  { 0x0300, 0x00, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHue */ \
+  { 0x0300, 0x01, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveHue */ \
+  { 0x0300, 0x02, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepHue */ \
+  { 0x0300, 0x03, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToSaturation */ \
+  { 0x0300, 0x04, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveSaturation */ \
+  { 0x0300, 0x05, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepSaturation */ \
+  { 0x0300, 0x06, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToHueAndSaturation */ \
+  { 0x0300, 0x07, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveToColor */ \
+  { 0x0300, 0x08, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): MoveColor */ \
+  { 0x0300, 0x09, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Color Control (client): StepColor */ \
+  { 0x0300, 0x0A, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveToColorTemperature */ \
+  { 0x0300, 0x47, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StopMoveStep */ \
+  { 0x0300, 0x4B, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): MoveColorTemperature */ \
+  { 0x0300, 0x4C, ZAP_COMMAND_MASK(INCOMING_CLIENT) | ZAP_COMMAND_MASK(OUTGOING_CLIENT) }, /* Color Control (client): StepColorTemperature */ \
+  { 0x0508, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Low Power (client): Sleep */ \
+  { 0xF000, 0x00, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Bind */ \
+  { 0xF000, 0x01, ZAP_COMMAND_MASK(INCOMING_SERVER) }, /* Binding (client): Unbind */ \
+}
+
 
 // Array of EmberAfManufacturerCodeEntry structures for commands.
 #define GENERATED_COMMAND_MANUFACTURER_CODE_COUNT (1)
-#define GENERATED_COMMAND_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        { 37, 4098 },                                                                                                              \
-    }
+#define GENERATED_COMMAND_MANUFACTURER_CODES { \
+  { 37, 4098 },\
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for clusters.
 #define GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_CLUSTER_MANUFACTURER_CODES                                                                                       \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_CLUSTER_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // This is an array of EmberAfManufacturerCodeEntry structures for attributes.
 #define GENERATED_ATTRIBUTE_MANUFACTURER_CODE_COUNT (0)
-#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES                                                                                     \
-    {                                                                                                                              \
-        {                                                                                                                          \
-            0x00, 0x00                                                                                                             \
-        }                                                                                                                          \
-    }
+#define GENERATED_ATTRIBUTE_MANUFACTURER_CODES { \
+  { 0x00, 0x00 } \
+}
+
 
 // Array of EmberAfPluginReportingEntry structures.
-#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_##x
+#define ZRD(x) EMBER_ZCL_REPORTING_DIRECTION_ ## x
 #define ZAP_REPORT_DIRECTION(x) ZRD(x)
 
 // User options for plugin Reporting
@@ -437,6 +292,7 @@
 #define EMBER_AF_PLUGIN_REPORTING_ENABLE_GROUP_BOUND_REPORTS
 
 #define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS_TABLE_SIZE (0)
-#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS                                                                               \
-    {                                                                                                                              \
-    }
+#define EMBER_AF_GENERATED_REPORTING_CONFIG_DEFAULTS { \
+}
+
+
diff --git a/src/darwin/Framework/CHIP/gen/enums.h b/src/darwin/Framework/CHIP/gen/enums.h
index 1c2ba41e5ef3fb..b71799df44e5df 100644
--- a/src/darwin/Framework/CHIP/gen/enums.h
+++ b/src/darwin/Framework/CHIP/gen/enums.h
@@ -22,2689 +22,2471 @@
 
 // ZCL enums
 
+
 // Enum for 11073ConnectRequestConnectControl
-typedef enum
-{
-    EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
+typedef enum {
+  EMBER_ZCL_11073_CONNECT_REQUEST_CONNECT_CONTROL_PREEMPTIBLE = 1,
 } EmberAf11073ConnectRequestConnectControl;
 
 // Enum for 11073TunnelConnectionStatus
-typedef enum
-{
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED      = 0,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED         = 1,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED    = 2,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
-    EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
+typedef enum {
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_DISCONNECTED = 0,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_CONNECTED = 1,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_NOT_AUTHORIZED = 2,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_RECONNECT_REQUEST = 3,
+  EMBER_ZCL_11073_TUNNEL_CONNECTION_STATUS_ALREADY_CONNECTED = 4,
 } EmberAf11073TunnelConnectionStatus;
 
 // Enum for AlertCountType
-typedef enum
-{
-    EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
+typedef enum {
+  EMBER_ZCL_ALERT_COUNT_TYPE_UNSTRUCTURED = 0,
 } EmberAfAlertCountType;
 
 // Enum for AlertStructureCategory
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER  = 512,
-    EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_WARNING = 256,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_DANGER = 512,
+  EMBER_ZCL_ALERT_STRUCTURE_CATEGORY_FAILURE = 768,
 } EmberAfAlertStructureCategory;
 
 // Enum for AlertStructurePresenceRecovery
-typedef enum
-{
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
-    EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
+typedef enum {
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_RECOVERY = 0,
+  EMBER_ZCL_ALERT_STRUCTURE_PRESENCE_RECOVERY_PRESENCE = 4096,
 } EmberAfAlertStructurePresenceRecovery;
 
 // Enum for AlternateCostUnit
-typedef enum
-{
-    EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
+typedef enum {
+  EMBER_ZCL_ALTERNATE_COST_UNIT_KG_OF_CO2_PER_UNIT_OF_MEASURE = 2,
 } EmberAfAlternateCostUnit;
 
 // Enum for AmiCriticalityLevel
-typedef enum
-{
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED           = 0,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN              = 1,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_1                  = 2,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_2                  = 3,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_3                  = 4,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_4                  = 5,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_5                  = 6,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY          = 7,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE     = 8,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1   = 10,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2   = 11,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3   = 12,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4   = 13,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5   = 14,
-    EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6   = 15,
+typedef enum {
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_RESERVED = 0,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_GREEN = 1,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_1 = 2,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_2 = 3,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_3 = 4,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_4 = 5,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_5 = 6,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_EMERGENCY = 7,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_PLANNED_OUTAGE = 8,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_SERVICE_DISCONNECT = 9,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED1 = 10,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED2 = 11,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED3 = 12,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED4 = 13,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED5 = 14,
+  EMBER_ZCL_AMI_CRITICALITY_LEVEL_UTILITY_DEFINED6 = 15,
 } EmberAfAmiCriticalityLevel;
 
 // Enum for AmiEventStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX                          = 1,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED                                          = 2,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED                                        = 3,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT                             = 4,
-    EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN                              = 5,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED                            = 6,
-    EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED                          = 7,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT            = 8,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN           = 9,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
-    EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT                                        = 246,
-    EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND                                        = 247,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND                        = 248,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED                                 = 251,
-    EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT                = 253,
-    EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED                    = 254,
+typedef enum {
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_RX = 1,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_STARTED = 2,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED = 3,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_OUT = 4,
+  EMBER_ZCL_AMI_EVENT_STATUS_USER_HAS_CHOOSE_TO_OPT_IN = 5,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_CANCELED = 6,
+  EMBER_ZCL_AMI_EVENT_STATUS_THE_EVENT_HAS_BEEN_SUPERSEDED = 7,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_WITH_USER_OPT_OUT = 8,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_PARTIALLY_COMPLETED_DUE_TO_USER_OPT_IN = 9,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_COMPLETED_NO_USER_PARTICIPATION_PREVIOUS_OPT_OUT = 10,
+  EMBER_ZCL_AMI_EVENT_STATUS_INVALID_OPT_OUT = 246,
+  EMBER_ZCL_AMI_EVENT_STATUS_EVENT_NOT_FOUND = 247,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND = 248,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_COMMAND_INVALID_EFFECTIVE_TIME = 249,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_EVENT_EXPIRED = 251,
+  EMBER_ZCL_AMI_EVENT_STATUS_REJECTED_INVALID_CANCEL_UNDEFINED_EVENT = 253,
+  EMBER_ZCL_AMI_EVENT_STATUS_LOAD_CONTROL_EVENT_COMMAND_REJECTED = 254,
 } EmberAfAmiEventStatus;
 
 // Enum for AmiGetProfileStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS                                       = 0,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED          = 1,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED                = 2,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME                              = 3,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED   = 4,
-    EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
+typedef enum {
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_UNDEFINED_INTERVAL_CHANNEL_REQUESTED = 1,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INTERVAL_CHANNEL_NOT_SUPPORTED = 2,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_INVALID_END_TIME = 3,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_MORE_PERIODS_REQUESTED_THAN_CAN_BE_RETURNED = 4,
+  EMBER_ZCL_AMI_GET_PROFILE_STATUS_NO_INTERVALS_AVAILABLE_FOR_THE_REQUESTED_TIME = 5,
 } EmberAfAmiGetProfileStatus;
 
 // Enum for AmiIntervalChannel
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
-    EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED  = 1,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_DELIVERED = 0,
+  EMBER_ZCL_AMI_INTERVAL_CHANNEL_CONSUMPTION_RECEIVED = 1,
 } EmberAfAmiIntervalChannel;
 
 // Enum for AmiIntervalPeriod
-typedef enum
-{
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY      = 0,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60  = 1,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30  = 2,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15  = 3,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10  = 4,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5   = 6,
-    EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
+typedef enum {
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_DAILY = 0,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES60 = 1,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES30 = 2,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES15 = 3,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES10 = 4,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES7P5 = 5,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES5 = 6,
+  EMBER_ZCL_AMI_INTERVAL_PERIOD_MINUTES2P5 = 7,
 } EmberAfAmiIntervalPeriod;
 
 // Enum for AmiKeyEstablishmentStatus
-typedef enum
-{
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER    = 1,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM   = 2,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE       = 3,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES      = 4,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
-    EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
+typedef enum {
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNKNOWN_ISSUER = 1,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_KEY_CONFIRM = 2,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_BAD_MESSAGE = 3,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_NO_RESOURCES = 4,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_UNSUPPORTED_SUITE = 5,
+  EMBER_ZCL_AMI_KEY_ESTABLISHMENT_STATUS_INVALID_KEY_USAGE = 6,
 } EmberAfAmiKeyEstablishmentStatus;
 
 // Enum for AmiRegistrationState
-typedef enum
-{
-    EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED                   = 0,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK                = 1,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK                 = 2,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED          = 4,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED                     = 5,
-    EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE     = 6,
+typedef enum {
+  EMBER_ZCL_AMI_REGISTRATION_STATE_UNREGISTERED = 0,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINING_NETWORK = 1,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_JOINED_NETWORK = 2,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_SUBMITTED_REGISTRATION_REQUEST = 3,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTRATION_REJECTED = 4,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERED = 5,
+  EMBER_ZCL_AMI_REGISTRATION_STATE_REGISTERATION_NOT_POSSIBLE = 6,
 } EmberAfAmiRegistrationState;
 
 // Enum for AmiUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS                = 0,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR           = 1,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR            = 2,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR     = 3,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR            = 4,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR      = 5,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR          = 6,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR      = 7,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE                      = 8,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE                   = 9,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND          = 10,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS                       = 11,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND            = 12,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS           = 13,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD            = 128,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD       = 129,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD        = 130,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD        = 132,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD  = 133,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD      = 134,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD  = 135,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD                  = 136,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD               = 137,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD      = 138,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD                   = 139,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD        = 140,
-    EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD       = 141,
+typedef enum {
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS = 0,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR = 1,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR = 2,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR = 3,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR = 4,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR = 5,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR = 6,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR = 7,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GAUGE = 8,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE = 9,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND = 10,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS = 11,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND = 12,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS = 13,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KILO_WATT_HOURS_BCD = 128,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_METER_PER_HOUR_BCD = 129,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CUBIC_FEET_PER_HOUR_BCD = 130,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_CENTUM_CUBIC_FEET_PER_HOUR_BCD = 131,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_US_GALLONS_PER_HOUR_BCD = 132,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_IMPERIAL_GALLONS_PER_HOUR_BCD = 133,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_BT_US_OR_BTU_PER_HOUR_BCD = 134,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_LITERS_OR_LITERS_PER_HOUR_BCD = 135,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_GUAGE_BCD = 136,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_KPA_ABSOLUTE_BCD = 137,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MCF_OR_MCF_PER_SECOND_BCD = 138,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_UNITLESS_BCD = 139,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_MJ_OR_MJ_PER_SECOND_BCD = 140,
+  EMBER_ZCL_AMI_UNIT_OF_MEASURE_K_VAR_OR_K_VAR_HOURS_BCD = 141,
 } EmberAfAmiUnitOfMeasure;
 
 // Enum for AnonymousDataState
-typedef enum
-{
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
-    EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND    = 1,
+typedef enum {
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_NO_SOURCE_FOUND = 0,
+  EMBER_ZCL_ANONYMOUS_DATA_STATE_SOURCE_FOUND = 1,
 } EmberAfAnonymousDataState;
 
 // Enum for ApplianceStatus
-typedef enum
-{
-    EMBER_ZCL_APPLIANCE_STATUS_OFF                         = 1,
-    EMBER_ZCL_APPLIANCE_STATUS_STAND_BY                    = 2,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED                  = 3,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
-    EMBER_ZCL_APPLIANCE_STATUS_RUNNING                     = 5,
-    EMBER_ZCL_APPLIANCE_STATUS_PAUSE                       = 6,
-    EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED              = 7,
-    EMBER_ZCL_APPLIANCE_STATUS_FAILURE                     = 8,
-    EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED       = 9,
-    EMBER_ZCL_APPLIANCE_STATUS_IDLE                        = 10,
-    EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD                  = 11,
-    EMBER_ZCL_APPLIANCE_STATUS_SERVICE                     = 12,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING               = 13,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING                = 14,
-    EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING                = 15,
+typedef enum {
+  EMBER_ZCL_APPLIANCE_STATUS_OFF = 1,
+  EMBER_ZCL_APPLIANCE_STATUS_STAND_BY = 2,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED = 3,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMMED_WAITING_TO_START = 4,
+  EMBER_ZCL_APPLIANCE_STATUS_RUNNING = 5,
+  EMBER_ZCL_APPLIANCE_STATUS_PAUSE = 6,
+  EMBER_ZCL_APPLIANCE_STATUS_END_PROGRAMMED = 7,
+  EMBER_ZCL_APPLIANCE_STATUS_FAILURE = 8,
+  EMBER_ZCL_APPLIANCE_STATUS_PROGRAMME_INTERRUPTED = 9,
+  EMBER_ZCL_APPLIANCE_STATUS_IDLE = 10,
+  EMBER_ZCL_APPLIANCE_STATUS_RINSE_HOLD = 11,
+  EMBER_ZCL_APPLIANCE_STATUS_SERVICE = 12,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERFREEZING = 13,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERCOOLING = 14,
+  EMBER_ZCL_APPLIANCE_STATUS_SUPERHEATING = 15,
 } EmberAfApplianceStatus;
 
 // Enum for ApplicationBasicStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED    = 0,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING    = 1,
-    EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_STOPPED = 0,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_RUNNING = 1,
+  EMBER_ZCL_APPLICATION_BASIC_STATUS_BACKGROUND = 2,
 } EmberAfApplicationBasicStatus;
 
 // Enum for ApplicationLauncherStatus
-typedef enum
-{
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SUCCESS = 0,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_APPLICATION_LAUNCHER_STATUS_SYSTEM_BUSY = 2,
 } EmberAfApplicationLauncherStatus;
 
 // Enum for AttributeReportingStatus
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING                      = 0,
-    EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_PENDING = 0,
+  EMBER_ZCL_ATTRIBUTE_REPORTING_STATUS_ATTRIBUTE_REPORTING_COMPLETE = 1,
 } EmberAfAttributeReportingStatus;
 
 // Enum for AttributeWritePermission
-typedef enum
-{
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE               = 0,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL       = 1,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE    = 134,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE            = 135,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY                = 136,
-    EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE        = 141,
+typedef enum {
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE = 0,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL = 1,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY = 2,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_UNSUPPORTED_ATTRIBUTE = 134,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_VALUE = 135,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_READ_ONLY = 136,
+  EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_INVALID_DATA_TYPE = 141,
 } EmberAfAttributeWritePermission;
 
 // Enum for AudioOutputType
-typedef enum
-{
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI      = 0,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT        = 1,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL   = 2,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL  = 4,
-    EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER     = 5,
+typedef enum {
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI = 0,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_BT = 1,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OPTICAL = 2,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_HEADPHONE = 3,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_INTERNAL = 4,
+  EMBER_ZCL_AUDIO_OUTPUT_TYPE_OTHER = 5,
 } EmberAfAudioOutputType;
 
 // Enum for BarrierControlBarrierPosition
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED  = 0,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN    = 100,
-    EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN = 100,
+  EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_UNKNOWN = 255,
 } EmberAfBarrierControlBarrierPosition;
 
 // Enum for BarrierControlMovingState
-typedef enum
-{
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
-    EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
+typedef enum {
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_STOPPED = 0,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_CLOSING = 1,
+  EMBER_ZCL_BARRIER_CONTROL_MOVING_STATE_OPENING = 2,
 } EmberAfBarrierControlMovingState;
 
 // Enum for BatterySize
-typedef enum
-{
-    EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
-    EMBER_ZCL_BATTERY_SIZE_BUILT_IN   = 1,
-    EMBER_ZCL_BATTERY_SIZE_OTHER      = 2,
-    EMBER_ZCL_BATTERY_SIZE_AA         = 3,
-    EMBER_ZCL_BATTERY_SIZE_AAA        = 4,
-    EMBER_ZCL_BATTERY_SIZE_C          = 5,
-    EMBER_ZCL_BATTERY_SIZE_D          = 6,
-    EMBER_ZCL_BATTERY_SIZE_UNKNOWN    = 255,
+typedef enum {
+  EMBER_ZCL_BATTERY_SIZE_NO_BATTERY = 0,
+  EMBER_ZCL_BATTERY_SIZE_BUILT_IN = 1,
+  EMBER_ZCL_BATTERY_SIZE_OTHER = 2,
+  EMBER_ZCL_BATTERY_SIZE_AA = 3,
+  EMBER_ZCL_BATTERY_SIZE_AAA = 4,
+  EMBER_ZCL_BATTERY_SIZE_C = 5,
+  EMBER_ZCL_BATTERY_SIZE_D = 6,
+  EMBER_ZCL_BATTERY_SIZE_UNKNOWN = 255,
 } EmberAfBatterySize;
 
 // Enum for BillingPeriodDurationUnits
-typedef enum
-{
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS    = 4194304,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS   = 8388608,
-    EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS  = 12582912,
+typedef enum {
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MINUTES = 0,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_DAYS = 4194304,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_WEEKS = 8388608,
+  EMBER_ZCL_BILLING_PERIOD_DURATION_UNITS_MONTHS = 12582912,
 } EmberAfBillingPeriodDurationUnits;
 
 // Enum for Block
-typedef enum
-{
-    EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_BLOCK_BLOCK1           = 1,
-    EMBER_ZCL_BLOCK_BLOCK2           = 2,
-    EMBER_ZCL_BLOCK_BLOCK3           = 3,
-    EMBER_ZCL_BLOCK_BLOCK4           = 4,
-    EMBER_ZCL_BLOCK_BLOCK5           = 5,
-    EMBER_ZCL_BLOCK_BLOCK6           = 6,
-    EMBER_ZCL_BLOCK_BLOCK7           = 7,
-    EMBER_ZCL_BLOCK_BLOCK8           = 8,
-    EMBER_ZCL_BLOCK_BLOCK9           = 9,
-    EMBER_ZCL_BLOCK_BLOCK10          = 10,
-    EMBER_ZCL_BLOCK_BLOCK11          = 11,
-    EMBER_ZCL_BLOCK_BLOCK12          = 12,
-    EMBER_ZCL_BLOCK_BLOCK13          = 13,
-    EMBER_ZCL_BLOCK_BLOCK14          = 14,
-    EMBER_ZCL_BLOCK_BLOCK15          = 15,
-    EMBER_ZCL_BLOCK_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_BLOCK_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_BLOCK_BLOCK1 = 1,
+  EMBER_ZCL_BLOCK_BLOCK2 = 2,
+  EMBER_ZCL_BLOCK_BLOCK3 = 3,
+  EMBER_ZCL_BLOCK_BLOCK4 = 4,
+  EMBER_ZCL_BLOCK_BLOCK5 = 5,
+  EMBER_ZCL_BLOCK_BLOCK6 = 6,
+  EMBER_ZCL_BLOCK_BLOCK7 = 7,
+  EMBER_ZCL_BLOCK_BLOCK8 = 8,
+  EMBER_ZCL_BLOCK_BLOCK9 = 9,
+  EMBER_ZCL_BLOCK_BLOCK10 = 10,
+  EMBER_ZCL_BLOCK_BLOCK11 = 11,
+  EMBER_ZCL_BLOCK_BLOCK12 = 12,
+  EMBER_ZCL_BLOCK_BLOCK13 = 13,
+  EMBER_ZCL_BLOCK_BLOCK14 = 14,
+  EMBER_ZCL_BLOCK_BLOCK15 = 15,
+  EMBER_ZCL_BLOCK_BLOCK16 = 16,
 } EmberAfBlock;
 
 // Enum for BlockPeriodDurationTypeControl
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE   = 16,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED     = 32,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_START_OF_TIMEBASE = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_END_OF_TIMEBASE = 16,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_CONTROL_NOT_SPECIFIED = 32,
 } EmberAfBlockPeriodDurationTypeControl;
 
 // Enum for BlockPeriodDurationTypeTimebase
-typedef enum
-{
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS    = 1,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS   = 2,
-    EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS  = 3,
+typedef enum {
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MINUTES = 0,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_DAYS = 1,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_WEEKS = 2,
+  EMBER_ZCL_BLOCK_PERIOD_DURATION_TYPE_TIMEBASE_MONTHS = 3,
 } EmberAfBlockPeriodDurationTypeTimebase;
 
 // Enum for CO2Unit
-typedef enum
-{
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR        = 1,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE   = 2,
-    EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
+typedef enum {
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_KILOWATT_HOUR = 1,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_GALLON_OF_GASOLINE = 2,
+  EMBER_ZCL_CO2_UNIT_KILOGRAM_PER_THERM_OF_NATURAL_GAS = 3,
 } EmberAfCO2Unit;
 
 // Enum for CalendarTimeReference
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME      = 0,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
-    EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME    = 2,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_UTC_TIME = 0,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_STANDARD_TIME = 1,
+  EMBER_ZCL_CALENDAR_TIME_REFERENCE_LOCAL_TIME = 2,
 } EmberAfCalendarTimeReference;
 
 // Enum for CalendarType
-typedef enum
-{
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR              = 0,
-    EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR               = 1,
-    EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
-    EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR        = 3,
-    EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
+typedef enum {
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_CALENDAR = 0,
+  EMBER_ZCL_CALENDAR_TYPE_RECEIVED_CALENDAR = 1,
+  EMBER_ZCL_CALENDAR_TYPE_DELIVERED_AND_RECEIVED_CALENDAR = 2,
+  EMBER_ZCL_CALENDAR_TYPE_FRIENDLY_CREDIT_CALENDAR = 3,
+  EMBER_ZCL_CALENDAR_TYPE_AUXILLIARY_LOAD_SWITCH_CALENDAR = 4,
 } EmberAfCalendarType;
 
 // Enum for CalorificValueUnit
-typedef enum
-{
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
-    EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM    = 2,
+typedef enum {
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_CUBIC_METER = 1,
+  EMBER_ZCL_CALORIFIC_VALUE_UNIT_MEGAJOULE_PER_KILOGRAM = 2,
 } EmberAfCalorificValueUnit;
 
 // Enum for CecedSpecificationVersion
-typedef enum
-{
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
-    EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED     = 26,
+typedef enum {
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_NOT_CERTIFIED = 16,
+  EMBER_ZCL_CECED_SPECIFICATION_VERSION_COMPLIANT_WITH_V10_CERTIFIED = 26,
 } EmberAfCecedSpecificationVersion;
 
 // Enum for ColorControlOptions
-typedef enum
-{
-    EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
 } EmberAfColorControlOptions;
 
 // Enum for ColorLoopAction
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE                                  = 0,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
-    EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE          = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_ACTION_DEACTIVATE = 0,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_COLOR_LOOP_START_ENHANCED_HUE = 1,
+  EMBER_ZCL_COLOR_LOOP_ACTION_ACTIVATE_FROM_ENHANCED_CURRENT_HUE = 2,
 } EmberAfColorLoopAction;
 
 // Enum for ColorLoopDirection
-typedef enum
-{
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
-    EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
+typedef enum {
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_DECREMENT_HUE = 0,
+  EMBER_ZCL_COLOR_LOOP_DIRECTION_INCREMENT_HUE = 1,
 } EmberAfColorLoopDirection;
 
 // Enum for ColorMode
-typedef enum
-{
-    EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
-    EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y            = 1,
-    EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE                  = 2,
+typedef enum {
+  EMBER_ZCL_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_COLOR_MODE_COLOR_TEMPERATURE = 2,
 } EmberAfColorMode;
 
 // Enum for CommandIdentification
-typedef enum
-{
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START                  = 1,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP                   = 2,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE                  = 3,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING    = 4,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING     = 5,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING     = 6,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING      = 7,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS            = 8,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS             = 9,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL  = 10,
-    EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
+typedef enum {
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START = 1,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP = 2,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_PAUSE = 3,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERFREEZING = 4,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERFREEZING = 5,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_START_SUPERCOOLING = 6,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_STOP_SUPERCOOLING = 7,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_GAS = 8,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_GAS = 9,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_ENABLE_ENERGY_CONTROL = 10,
+  EMBER_ZCL_COMMAND_IDENTIFICATION_DISABLE_ENERGY_CONTROL = 11,
 } EmberAfCommandIdentification;
 
 // Enum for CommissioningStartupControl
-typedef enum
-{
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION          = 0,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK       = 1,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK     = 2,
-    EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
+typedef enum {
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_NO_ACTION = 0,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_FORM_NETWORK = 1,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_REJOIN_NETWORK = 2,
+  EMBER_ZCL_COMMISSIONING_STARTUP_CONTROL_START_FROM_SCRATCH = 3,
 } EmberAfCommissioningStartupControl;
 
 // Enum for CommodityType
-typedef enum
-{
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING                   = 0,
-    EMBER_ZCL_COMMODITY_TYPE_GAS_METERING                        = 1,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_METERING                      = 2,
-    EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING                    = 3,
-    EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING                   = 4,
-    EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING                       = 5,
-    EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING                    = 6,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING  = 7,
-    EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING              = 8,
-    EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING    = 9,
-    EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING   = 10,
-    EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING           = 11,
-    EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1          = 13,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2          = 14,
-    EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3          = 15,
+typedef enum {
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_COMMODITY_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_COMMODITY_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_COMMODITY_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_COMMODITY_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_COMMODITY_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_COMMODITY_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_COMMODITY_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_COMMODITY_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_COMMODITY_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_COMMODITY_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_COMMODITY_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
 } EmberAfCommodityType;
 
 // Enum for ContentLaunchStatus
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED       = 2,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_SUCCESS = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_URL_NOT_AVAILABLE = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_STATUS_AUTH_FAILED = 2,
 } EmberAfContentLaunchStatus;
 
 // Enum for ContentLaunchType
-typedef enum
-{
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR       = 0,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL     = 1,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER   = 2,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT       = 3,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE   = 4,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE       = 5,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE      = 6,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY  = 7,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT       = 8,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
-    EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO       = 10,
+typedef enum {
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_ACTOR = 0,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHANNEL = 1,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_CHARACTER = 2,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_EVENT = 3,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_FRANCHISE = 4,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_GENRE = 5,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_LEAGUE = 6,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_POPULARITY = 7,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORT = 8,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_SPORTS_TEAM = 9,
+  EMBER_ZCL_CONTENT_LAUNCH_TYPE_VIDEO = 10,
 } EmberAfContentLaunchType;
 
 // Enum for CppEventResponseCppAuth
-typedef enum
-{
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
+typedef enum {
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_CPP_EVENT_RESPONSE_CPP_AUTH_REJECTED = 2,
 } EmberAfCppEventResponseCppAuth;
 
 // Enum for CppPriceTier
-typedef enum
-{
-    EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
-    EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
+typedef enum {
+  EMBER_ZCL_CPP_PRICE_TIER_CPP1 = 0,
+  EMBER_ZCL_CPP_PRICE_TIER_CPP2 = 1,
 } EmberAfCppPriceTier;
 
 // Enum for CreditAdjustmentType
-typedef enum
-{
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
-    EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE    = 1,
+typedef enum {
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_INCREMENTAL = 0,
+  EMBER_ZCL_CREDIT_ADJUSTMENT_TYPE_CREDIT_ABSOLUTE = 1,
 } EmberAfCreditAdjustmentType;
 
 // Enum for CreditPaymentStatus
-typedef enum
-{
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING            = 0,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID      = 1,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE            = 2,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
-    EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
+typedef enum {
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_PENDING = 0,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_RECEIVED_PAID = 1,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_OVERDUE = 2,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_2_PAYMENTS_OVERDUE = 3,
+  EMBER_ZCL_CREDIT_PAYMENT_STATUS_3_PAYMENTS_OVERDUE = 4,
 } EmberAfCreditPaymentStatus;
 
 // Enum for DataQualityId
-typedef enum
-{
-    EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED                       = 0,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED   = 1,
-    EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
-    EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA                       = 3,
+typedef enum {
+  EMBER_ZCL_DATA_QUALITY_ID_ALL_DATA_CERTIFIED = 0,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_INSTANTANEOUS_POWER_NOT_CERTIFIED = 1,
+  EMBER_ZCL_DATA_QUALITY_ID_ONLY_CUMULATED_CONSUMPTION_NOT_CERTIFIED = 2,
+  EMBER_ZCL_DATA_QUALITY_ID_NOT_CERTIFIED_DATA = 3,
 } EmberAfDataQualityId;
 
 // Enum for DebtAmountType
-typedef enum
-{
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE    = 0,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE    = 2,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE    = 4,
-    EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
+typedef enum {
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_ABSOLUTE = 0,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE1_INCREMENTAL = 1,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_ABSOLUTE = 2,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE2_INCREMENTAL = 3,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_ABSOLUTE = 4,
+  EMBER_ZCL_DEBT_AMOUNT_TYPE_TYPE3_INCREMENTAL = 5,
 } EmberAfDebtAmountType;
 
 // Enum for DebtRecoveryFrequency
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR    = 0,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY     = 1,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK    = 2,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH   = 3,
-    EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_HOUR = 0,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_DAY = 1,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_WEEK = 2,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_MONTH = 3,
+  EMBER_ZCL_DEBT_RECOVERY_FREQUENCY_PER_QUARTER = 4,
 } EmberAfDebtRecoveryFrequency;
 
 // Enum for DebtRecoveryMethod
-typedef enum
-{
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED       = 0,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
-    EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED   = 2,
+typedef enum {
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_TIME_BASED = 0,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_PERCENTAGE_BASED = 1,
+  EMBER_ZCL_DEBT_RECOVERY_METHOD_CATCH_UP_BASED = 2,
 } EmberAfDebtRecoveryMethod;
 
 // Enum for DehumidifcationLockout
-typedef enum
-{
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
-    EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED     = 1,
+typedef enum {
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_NOT_ALLOWED = 0,
+  EMBER_ZCL_DEHUMIDIFCATION_LOCKOUT_ALLOWED = 1,
 } EmberAfDehumidifcationLockout;
 
 // Enum for DeviceInformationRecordSort
-typedef enum
-{
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED      = 0,
-    EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
+typedef enum {
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_NOT_SORTED = 0,
+  EMBER_ZCL_DEVICE_INFORMATION_RECORD_SORT_TOP_OF_THE_LIST = 1,
 } EmberAfDeviceInformationRecordSort;
 
 // Enum for DeviceStatus2Structure
-typedef enum
-{
-    EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
+typedef enum {
+  EMBER_ZCL_DEVICE_STATUS2_STRUCTURE_IRIS_SYMPTOM_CODE = 32,
 } EmberAfDeviceStatus2Structure;
 
 // Enum for DoorLockEventSource
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD        = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF            = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL        = 2,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID          = 3,
-    EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_KEYPAD = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RF = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_MANUAL = 2,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_RFID = 3,
+  EMBER_ZCL_DOOR_LOCK_EVENT_SOURCE_INDETERMINATE = 255,
 } EmberAfDoorLockEventSource;
 
 // Enum for DoorLockEventType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION   = 0,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
-    EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM       = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_OPERATION = 0,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_PROGRAMMING = 1,
+  EMBER_ZCL_DOOR_LOCK_EVENT_TYPE_ALARM = 2,
 } EmberAfDoorLockEventType;
 
 // Enum for DoorLockOperatingMode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE            = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE          = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 5,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NORMAL_MODE = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_VACATION_MODE = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE = 5,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC  = 0,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK                     = 1,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK                   = 2,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID   = 3,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE    = 4,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE  = 6,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK           = 7,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK                 = 8,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK               = 9,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK                = 10,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK            = 11,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK          = 12,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK              = 13,
-    EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK            = 14,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK = 1,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK = 2,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_PIN_OR_ID = 3,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_LOCK_INVALID_SCHEDULE = 4,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_PIN_OR_ID = 5,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_UNLOCK_INVALID_SCHEDULE = 6,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_ONE_TOUCH_LOCK = 7,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_LOCK = 8,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_KEY_UNLOCK = 9,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_AUTO_LOCK = 10,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_LOCK = 11,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_SCHEDULE_UNLOCK = 12,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_LOCK = 13,
+  EMBER_ZCL_DOOR_LOCK_OPERATION_EVENT_CODE_MANUAL_UNLOCK = 14,
 } EmberAfDoorLockOperationEventCode;
 
 // Enum for DoorLockProgrammingEventCode
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED     = 1,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED               = 2,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED             = 3,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED             = 4,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED                = 5,
-    EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED              = 6,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_UNKNOWN_OR_MFG_SPECIFIC = 0,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_MASTER_CODE_CHANGED = 1,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_ADDED = 2,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_DELETED = 3,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_PIN_CHANGED = 4,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_ADDED = 5,
+  EMBER_ZCL_DOOR_LOCK_PROGRAMMING_EVENT_CODE_ID_DELETED = 6,
 } EmberAfDoorLockProgrammingEventCode;
 
 // Enum for DoorLockSecurityLevel
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
-    EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY     = 1,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_NETWORK_SECURITY = 0,
+  EMBER_ZCL_DOOR_LOCK_SECURITY_LEVEL_APS_SECURITY = 1,
 } EmberAfDoorLockSecurityLevel;
 
 // Enum for DoorLockSetPinOrIdStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS              = 0,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE      = 1,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL          = 2,
-    EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_SUCCESS = 0,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_GENERAL_FAILURE = 1,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_MEMORY_FULL = 2,
+  EMBER_ZCL_DOOR_LOCK_SET_PIN_OR_ID_STATUS_DUPLICATE_CODE_ERROR = 3,
 } EmberAfDoorLockSetPinOrIdStatus;
 
 // Enum for DoorLockSoundVolume
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW    = 1,
-    EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH   = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_SILENT = 0,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_LOW = 1,
+  EMBER_ZCL_DOOR_LOCK_SOUND_VOLUME_HIGH = 2,
 } EmberAfDoorLockSoundVolume;
 
 // Enum for DoorLockState
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
-    EMBER_ZCL_DOOR_LOCK_STATE_LOCKED           = 1,
-    EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED         = 2,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_STATE_NOT_FULLY_LOCKED = 0,
+  EMBER_ZCL_DOOR_LOCK_STATE_LOCKED = 1,
+  EMBER_ZCL_DOOR_LOCK_STATE_UNLOCKED = 2,
 } EmberAfDoorLockState;
 
 // Enum for DoorLockType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT      = 0,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC       = 1,
-    EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE        = 2,
-    EMBER_ZCL_DOOR_LOCK_TYPE_RIM            = 3,
-    EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT     = 4,
-    EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL    = 5,
-    EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR        = 6,
-    EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
-    EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH     = 8,
-    EMBER_ZCL_DOOR_LOCK_TYPE_OTHER          = 9,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_BOLT = 0,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MAGNETIC = 1,
+  EMBER_ZCL_DOOR_LOCK_TYPE_MORTISE = 2,
+  EMBER_ZCL_DOOR_LOCK_TYPE_RIM = 3,
+  EMBER_ZCL_DOOR_LOCK_TYPE_LATCH_BOLT = 4,
+  EMBER_ZCL_DOOR_LOCK_TYPE_CYLINDRICAL = 5,
+  EMBER_ZCL_DOOR_LOCK_TYPE_TUBULAR = 6,
+  EMBER_ZCL_DOOR_LOCK_TYPE_INTERCONNECTED = 7,
+  EMBER_ZCL_DOOR_LOCK_TYPE_DEAD_LATCH = 8,
+  EMBER_ZCL_DOOR_LOCK_TYPE_OTHER = 9,
 } EmberAfDoorLockType;
 
 // Enum for DoorLockUserStatus
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE         = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED  = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED     = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_AVAILABLE = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_ENABLED = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_OCCUPIED_DISABLED = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_STATUS_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserStatus;
 
 // Enum for DoorLockUserType
-typedef enum
-{
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED           = 0,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER            = 3,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER        = 4,
-    EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED          = 255,
+typedef enum {
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_UNRESTRICTED = 0,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_YEAR_DAY_SCHEDULE_USER = 1,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_WEEK_DAY_SCHEDULE_USER = 2,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_MASTER_USER = 3,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NON_ACCESS_USER = 4,
+  EMBER_ZCL_DOOR_LOCK_USER_TYPE_NOT_SUPPORTED = 255,
 } EmberAfDoorLockUserType;
 
 // Enum for DoorState
-typedef enum
-{
-    EMBER_ZCL_DOOR_STATE_OPEN              = 0,
-    EMBER_ZCL_DOOR_STATE_CLOSED            = 1,
-    EMBER_ZCL_DOOR_STATE_ERROR_JAMMED      = 2,
-    EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
-    EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
+typedef enum {
+  EMBER_ZCL_DOOR_STATE_OPEN = 0,
+  EMBER_ZCL_DOOR_STATE_CLOSED = 1,
+  EMBER_ZCL_DOOR_STATE_ERROR_JAMMED = 2,
+  EMBER_ZCL_DOOR_STATE_ERROR_FORCED_OPEN = 3,
+  EMBER_ZCL_DOOR_STATE_ERROR_UNSPECIFIED = 4,
 } EmberAfDoorState;
 
 // Enum for ElectricityAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1         = 16,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1        = 17,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2         = 18,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2        = 19,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3         = 20,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3        = 21,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1        = 22,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2        = 23,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3        = 24,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1   = 25,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1  = 26,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2   = 27,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2  = 28,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3   = 29,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3  = 30,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT           = 31,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY     = 33,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE     = 34,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE          = 35,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE           = 36,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE         = 37,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD     = 38,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD     = 39,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
-    EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED  = 41,
+typedef enum {
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_GROUND_FAULT = 31,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_OVER_VOLTAGE = 36,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_ELECTRICITY_ALARM_GROUPS_TERMINAL_COVER_CLOSED = 41,
 } EmberAfElectricityAlarmGroups;
 
 // Enum for EnhancedColorMode
-typedef enum
-{
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION          = 0,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y                     = 1,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE                           = 2,
-    EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
+typedef enum {
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_HUE_AND_CURRENT_SATURATION = 0,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_CURRENT_X_AND_CURRENT_Y = 1,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_COLOR_TEMPERATURE = 2,
+  EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 } EmberAfEnhancedColorMode;
 
 // Enum for EventConfigurationControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST                = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE            = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LIST = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_EVENT_GROUP = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_LOG_TYPE = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_CONTROL_APPLY_BY_CONFIGURATION_MATCH = 3,
 } EmberAfEventConfigurationControl;
 
 // Enum for EventConfigurationLogAction
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG            = 0,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER         = 1,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT          = 2,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT  = 3,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
-    EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT  = 5,
+typedef enum {
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_DO_NOT_LOG = 0,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_TAMPER = 1,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_FAULT = 2,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_GENERAL_EVENT = 3,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_SECURITY_EVENT = 4,
+  EMBER_ZCL_EVENT_CONFIGURATION_LOG_ACTION_LOG_AS_NETWORK_EVENT = 5,
 } EmberAfEventConfigurationLogAction;
 
 // Enum for EventControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
-    EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION    = 16,
+typedef enum {
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_MINIMAL_INFORMATION = 0,
+  EMBER_ZCL_EVENT_CONTROL_RETRIEVE_FULL_INFORMATION = 16,
 } EmberAfEventControl;
 
 // Enum for EventId
-typedef enum
-{
-    EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED                   = 0,
-    EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED                    = 1,
-    EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD                 = 2,
-    EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD              = 3,
-    EMBER_ZCL_EVENT_ID_BATTERY_FAILURE                       = 4,
-    EMBER_ZCL_EVENT_ID_LOW_BATTERY                           = 5,
-    EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR                  = 6,
-    EMBER_ZCL_EVENT_ID_RAM_ERROR                             = 7,
-    EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR                       = 8,
-    EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR              = 9,
-    EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR                        = 10,
-    EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE             = 11,
-    EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE                = 12,
-    EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED           = 13,
-    EMBER_ZCL_EVENT_ID_DST_ENABLED                           = 14,
-    EMBER_ZCL_EVENT_ID_DST_DISABLED                          = 15,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD                    = 16,
-    EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD                     = 17,
-    EMBER_ZCL_EVENT_ID_CLOCK_INVALID                         = 18,
-    EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN                       = 19,
-    EMBER_ZCL_EVENT_ID_COMMS_OK_HAN                          = 20,
-    EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT                         = 21,
-    EMBER_ZCL_EVENT_ID_POWER_LOSS                            = 22,
-    EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL                    = 23,
-    EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC                   = 24,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE               = 25,
-    EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
-    EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR                       = 27,
-    EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR                       = 28,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET                   = 29,
-    EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION          = 30,
-    EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED                     = 31,
-    EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT                     = 32,
-    EMBER_ZCL_EVENT_ID_MANUAL_CONNECT                        = 33,
-    EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION                  = 34,
-    EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION                   = 35,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED              = 36,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK                    = 37,
-    EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED               = 38,
-    EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED               = 39,
-    EMBER_ZCL_EVENT_ID_PROFILE_CLEARED                       = 40,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION         = 41,
-    EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED                    = 42,
-    EMBER_ZCL_EVENT_ID_PATCH_FAILURE                         = 43,
-    EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION                 = 44,
-    EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED                   = 45,
-    EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED          = 46,
-    EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED         = 47,
-    EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED          = 48,
-    EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY                    = 128,
-    EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE                    = 129,
-    EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE                         = 130,
-    EMBER_ZCL_EVENT_ID_OVER_VOLTAGE                          = 131,
-    EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE                        = 132,
-    EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD                    = 133,
-    EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD                    = 134,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED                = 135,
-    EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED                 = 136,
-    EMBER_ZCL_EVENT_ID_REVERSE_FLOW                          = 160,
-    EMBER_ZCL_EVENT_ID_TILT_TAMPER                           = 161,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED                 = 162,
-    EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED                  = 163,
-    EMBER_ZCL_EVENT_ID_EXCESS_FLOW                           = 164,
-    EMBER_ZCL_EVENT_ID_CREDIT_OK                             = 192,
-    EMBER_ZCL_EVENT_ID_LOW_CREDIT                            = 193,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE               = 192,
-    EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED            = 193,
-    EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED           = 194,
-    EMBER_ZCL_EVENT_ID_SUPPLY_ON                             = 195,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED                     = 196,
-    EMBER_ZCL_EVENT_ID_SUPPLY_OFF                            = 197,
-    EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED                      = 198,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A               = 224,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B               = 225,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C               = 226,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D               = 227,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E               = 228,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F               = 229,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G               = 230,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H               = 231,
-    EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I               = 232,
+typedef enum {
+  EMBER_ZCL_EVENT_ID_METER_COVER_REMOVED = 0,
+  EMBER_ZCL_EVENT_ID_METER_COVER_CLOSED = 1,
+  EMBER_ZCL_EVENT_ID_STRONG_MAGNETIC_FIELD = 2,
+  EMBER_ZCL_EVENT_ID_NO_STRONG_MAGNETIC_FIELD = 3,
+  EMBER_ZCL_EVENT_ID_BATTERY_FAILURE = 4,
+  EMBER_ZCL_EVENT_ID_LOW_BATTERY = 5,
+  EMBER_ZCL_EVENT_ID_PROGRAM_MEMORY_ERROR = 6,
+  EMBER_ZCL_EVENT_ID_RAM_ERROR = 7,
+  EMBER_ZCL_EVENT_ID_NV_MEMORY_ERROR = 8,
+  EMBER_ZCL_EVENT_ID_MEASUREMENT_SYSTEM_ERROR = 9,
+  EMBER_ZCL_EVENT_ID_WATCHDOG_ERROR = 10,
+  EMBER_ZCL_EVENT_ID_SUPPLY_DISCONNECT_FAILURE = 11,
+  EMBER_ZCL_EVENT_ID_SUPPLY_CONNECT_FAILURE = 12,
+  EMBER_ZCL_EVENT_ID_MEASURMENT_SOFTWARE_CHANGED = 13,
+  EMBER_ZCL_EVENT_ID_DST_ENABLED = 14,
+  EMBER_ZCL_EVENT_ID_DST_DISABLED = 15,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_BACKWARD = 16,
+  EMBER_ZCL_EVENT_ID_CLOCK_ADJ_FORWARD = 17,
+  EMBER_ZCL_EVENT_ID_CLOCK_INVALID = 18,
+  EMBER_ZCL_EVENT_ID_COMMS_ERROR_HAN = 19,
+  EMBER_ZCL_EVENT_ID_COMMS_OK_HAN = 20,
+  EMBER_ZCL_EVENT_ID_FRAUD_ATTEMPT = 21,
+  EMBER_ZCL_EVENT_ID_POWER_LOSS = 22,
+  EMBER_ZCL_EVENT_ID_INCORRECT_PROTOCOL = 23,
+  EMBER_ZCL_EVENT_ID_UNUSUAL_HAN_TRAFFIC = 24,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_CLOCK_CHANGE = 25,
+  EMBER_ZCL_EVENT_ID_COMMS_USING_UNAUTHENTICATED_COMPONENT = 26,
+  EMBER_ZCL_EVENT_ID_ERROR_REG_CLEAR = 27,
+  EMBER_ZCL_EVENT_ID_ALARM_REG_CLEAR = 28,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_HW_RESET = 29,
+  EMBER_ZCL_EVENT_ID_UNEXPECTED_PROGRAM_EXECUTION = 30,
+  EMBER_ZCL_EVENT_ID_EVENT_LOG_CLEARED = 31,
+  EMBER_ZCL_EVENT_ID_MANUAL_DISCONNECT = 32,
+  EMBER_ZCL_EVENT_ID_MANUAL_CONNECT = 33,
+  EMBER_ZCL_EVENT_ID_REMOTE_DISCONNECTION = 34,
+  EMBER_ZCL_EVENT_ID_LOCAL_DISCONNECTION = 35,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_EXCEEDED = 36,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_OK = 37,
+  EMBER_ZCL_EVENT_ID_LIMIT_THRESHOLD_CHANGED = 38,
+  EMBER_ZCL_EVENT_ID_MAXIMUM_DEMAND_EXCEEDED = 39,
+  EMBER_ZCL_EVENT_ID_PROFILE_CLEARED = 40,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_READY_FOR_ACTIVATION = 41,
+  EMBER_ZCL_EVENT_ID_FIRMWARE_ACTIVATED = 42,
+  EMBER_ZCL_EVENT_ID_PATCH_FAILURE = 43,
+  EMBER_ZCL_EVENT_ID_TOU_TARIFF_ACTIVATION = 44,
+  EMBER_ZCL_EVENT_ID_8X8_TARIFFACTIVATED = 45,
+  EMBER_ZCL_EVENT_ID_SINGLE_TARIFF_RATE_ACTIVATED = 46,
+  EMBER_ZCL_EVENT_ID_ASYNCHRONOUS_BILLING_OCCURRED = 47,
+  EMBER_ZCL_EVENT_ID_SYNCHRONOUS_BILLING_OCCURRED = 48,
+  EMBER_ZCL_EVENT_ID_INCORRECT_POLARITY = 128,
+  EMBER_ZCL_EVENT_ID_CURRENT_NO_VOLTAGE = 129,
+  EMBER_ZCL_EVENT_ID_UNDER_VOLTAGE = 130,
+  EMBER_ZCL_EVENT_ID_OVER_VOLTAGE = 131,
+  EMBER_ZCL_EVENT_ID_NORMAL_VOLTAGE = 132,
+  EMBER_ZCL_EVENT_ID_PF_BELOW_THRESHOLD = 133,
+  EMBER_ZCL_EVENT_ID_PF_ABOVE_THRESHOLD = 134,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_REMOVED = 135,
+  EMBER_ZCL_EVENT_ID_TERMINAL_COVER_CLOSED = 136,
+  EMBER_ZCL_EVENT_ID_REVERSE_FLOW = 160,
+  EMBER_ZCL_EVENT_ID_TILT_TAMPER = 161,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_REMOVED = 162,
+  EMBER_ZCL_EVENT_ID_BATTERY_COVER_CLOSED = 163,
+  EMBER_ZCL_EVENT_ID_EXCESS_FLOW = 164,
+  EMBER_ZCL_EVENT_ID_CREDIT_OK = 192,
+  EMBER_ZCL_EVENT_ID_LOW_CREDIT = 193,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_IN_USE = 192,
+  EMBER_ZCL_EVENT_ID_EMERGENCY_CREDIT_EXHAUSTED = 193,
+  EMBER_ZCL_EVENT_ID_ZERO_CREDIT_EC_NOT_SELECTED = 194,
+  EMBER_ZCL_EVENT_ID_SUPPLY_ON = 195,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF_AARMED = 196,
+  EMBER_ZCL_EVENT_ID_SUPPLY_OFF = 197,
+  EMBER_ZCL_EVENT_ID_DISCOUNT_APPLIED = 198,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_A = 224,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_B = 225,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_C = 226,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_D = 227,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_E = 228,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_F = 229,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_G = 230,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_H = 231,
+  EMBER_ZCL_EVENT_ID_MANUFACTURER_SPECIFIC_I = 232,
 } EmberAfEventId;
 
 // Enum for EventIdentification
-typedef enum
-{
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE        = 1,
-    EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
-    EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING      = 5,
-    EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF       = 6,
-    EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA          = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_CYCLE = 1,
+  EMBER_ZCL_EVENT_IDENTIFICATION_TEMPERATURE_REACHED = 4,
+  EMBER_ZCL_EVENT_IDENTIFICATION_END_OF_COOKING = 5,
+  EMBER_ZCL_EVENT_IDENTIFICATION_SWITCHING_OFF = 6,
+  EMBER_ZCL_EVENT_IDENTIFICATION_WRONG_DATA = 7,
 } EmberAfEventIdentification;
 
 // Enum for EventLogId
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS                = 0,
-    EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG              = 1,
-    EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG               = 2,
-    EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG       = 3,
-    EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG      = 4,
-    EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG       = 5,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG  = 6,
-    EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_ID_ALL_LOGS = 0,
+  EMBER_ZCL_EVENT_LOG_ID_TAMPER_LOG = 1,
+  EMBER_ZCL_EVENT_LOG_ID_FAULT_LOG = 2,
+  EMBER_ZCL_EVENT_LOG_ID_GENERAL_EVENT_LOG = 3,
+  EMBER_ZCL_EVENT_LOG_ID_SECURITY_EVENT_LOG = 4,
+  EMBER_ZCL_EVENT_LOG_ID_NETWORK_EVENT_LOG = 5,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_GENERAL_EVENT_LOG = 6,
+  EMBER_ZCL_EVENT_LOG_ID_GBCS_SECURITY_EVENT_LOG = 7,
 } EmberAfEventLogId;
 
 // Enum for EventLogPayloadControl
-typedef enum
-{
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
-    EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY       = 1,
+typedef enum {
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENTS_DO_NOT_CROSS_FRAME_BOUNDARY = 0,
+  EMBER_ZCL_EVENT_LOG_PAYLOAD_CONTROL_EVENT_CROSSES_FRAME_BOUNDARY = 1,
 } EmberAfEventLogPayloadControl;
 
 // Enum for ExtendedGenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED                                  = 117,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED                                 = 118,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS                                   = 125,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+typedef enum {
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_ENABLED = 117,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DST_DISABLED = 118,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_CLOCK_INVALID = 121,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_POWER_LOSS = 125,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_PROFILE_CLEARED = 138,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_BATTERY_WARNING = 140,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_NO_SIGNATURE = 142,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_START = 144,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_FAST_POLLING_END = 145,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_EXTENDED_GENERIC_ALARM_GROUPS_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
 } EmberAfExtendedGenericAlarmGroups;
 
 // Enum for ExtendedNumberOfPriceTiers
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16              = 1,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17              = 2,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18              = 3,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19              = 4,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20              = 5,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21              = 6,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22              = 7,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23              = 8,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24              = 9,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25              = 10,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26              = 11,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27              = 12,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28              = 13,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29              = 14,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30              = 15,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31              = 16,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32              = 17,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33              = 18,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34              = 19,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35              = 20,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36              = 21,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37              = 22,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38              = 23,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39              = 24,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40              = 25,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41              = 26,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42              = 27,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43              = 28,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44              = 29,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45              = 30,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46              = 31,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47              = 32,
-    EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48              = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_REFER_TO_NUMBER_OF_PRICE_TIERS_FIELD = 0,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS16 = 1,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS17 = 2,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS18 = 3,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS19 = 4,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS20 = 5,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS21 = 6,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS22 = 7,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS23 = 8,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS24 = 9,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS25 = 10,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS26 = 11,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS27 = 12,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS28 = 13,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS29 = 14,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS30 = 15,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS31 = 16,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS32 = 17,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS33 = 18,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS34 = 19,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS35 = 20,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS36 = 21,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS37 = 22,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS38 = 23,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS39 = 24,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS40 = 25,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS41 = 26,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS42 = 27,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS43 = 28,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS44 = 29,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS45 = 30,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS46 = 31,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS47 = 32,
+  EMBER_ZCL_EXTENDED_NUMBER_OF_PRICE_TIERS_NUMBER_OF_PRICE_TIERS48 = 33,
 } EmberAfExtendedNumberOfPriceTiers;
 
 // Enum for ExtendedPriceTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL        = 1,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL        = 2,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL        = 3,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL        = 4,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL        = 5,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL        = 6,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL        = 7,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL        = 8,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL        = 9,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL        = 10,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL        = 11,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL        = 12,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL        = 13,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL        = 14,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL        = 15,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL        = 16,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL        = 17,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL        = 18,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL        = 19,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL        = 20,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL        = 21,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL        = 22,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL        = 23,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL        = 24,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL        = 25,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL        = 26,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL        = 27,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL        = 28,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL        = 29,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL        = 30,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL        = 31,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL        = 32,
-    EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL        = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_PRICE_TIER_REFER_TO_PRICE_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER16_PRICE_LABEL = 1,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER17_PRICE_LABEL = 2,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER18_PRICE_LABEL = 3,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER19_PRICE_LABEL = 4,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER20_PRICE_LABEL = 5,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER21_PRICE_LABEL = 6,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER22_PRICE_LABEL = 7,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER23_PRICE_LABEL = 8,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER24_PRICE_LABEL = 9,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER25_PRICE_LABEL = 10,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER26_PRICE_LABEL = 11,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER27_PRICE_LABEL = 12,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER28_PRICE_LABEL = 13,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER29_PRICE_LABEL = 14,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER30_PRICE_LABEL = 15,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER31_PRICE_LABEL = 16,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER32_PRICE_LABEL = 17,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER33_PRICE_LABEL = 18,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER34_PRICE_LABEL = 19,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER35_PRICE_LABEL = 20,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER36_PRICE_LABEL = 21,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER37_PRICE_LABEL = 22,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER38_PRICE_LABEL = 23,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER39_PRICE_LABEL = 24,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER40_PRICE_LABEL = 25,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER41_PRICE_LABEL = 26,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER42_PRICE_LABEL = 27,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER43_PRICE_LABEL = 28,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER44_PRICE_LABEL = 29,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER45_PRICE_LABEL = 30,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER46_PRICE_LABEL = 31,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER47_PRICE_LABEL = 32,
+  EMBER_ZCL_EXTENDED_PRICE_TIER_TIER48_PRICE_LABEL = 33,
 } EmberAfExtendedPriceTier;
 
 // Enum for ExtendedRegisterTier
-typedef enum
-{
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD                 = 0,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
-    EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
+typedef enum {
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_REFER_TO_REGISTER_TIER_FIELD = 0,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER16_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER17_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER18_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER19_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER20_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER21_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER22_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER23_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER24_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER25_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER26_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER27_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER28_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER29_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER30_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER31_SUMMATION_DELIVERED_ATTRIBUTE = 16,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER32_SUMMATION_DELIVERED_ATTRIBUTE = 17,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER33_SUMMATION_DELIVERED_ATTRIBUTE = 18,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER34_SUMMATION_DELIVERED_ATTRIBUTE = 19,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER35_SUMMATION_DELIVERED_ATTRIBUTE = 20,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER36_SUMMATION_DELIVERED_ATTRIBUTE = 21,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER37_SUMMATION_DELIVERED_ATTRIBUTE = 22,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER38_SUMMATION_DELIVERED_ATTRIBUTE = 23,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER39_SUMMATION_DELIVERED_ATTRIBUTE = 24,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER40_SUMMATION_DELIVERED_ATTRIBUTE = 25,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER41_SUMMATION_DELIVERED_ATTRIBUTE = 26,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER42_SUMMATION_DELIVERED_ATTRIBUTE = 27,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER43_SUMMATION_DELIVERED_ATTRIBUTE = 28,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER44_SUMMATION_DELIVERED_ATTRIBUTE = 29,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER45_SUMMATION_DELIVERED_ATTRIBUTE = 30,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER46_SUMMATION_DELIVERED_ATTRIBUTE = 31,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER47_SUMMATION_DELIVERED_ATTRIBUTE = 32,
+  EMBER_ZCL_EXTENDED_REGISTER_TIER_CURRENT_TIER48_SUMMATION_DELIVERED_ATTRIBUTE = 33,
 } EmberAfExtendedRegisterTier;
 
 // Enum for EzModeCommissioningClusterType
-typedef enum
-{
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
-    EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
+typedef enum {
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_SERVER = 0,
+  EMBER_ZCL_EZ_MODE_COMMISSIONING_CLUSTER_TYPE_CLIENT = 1,
 } EmberAfEzModeCommissioningClusterType;
 
 // Enum for FanMode
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_OFF    = 0,
-    EMBER_ZCL_FAN_MODE_LOW    = 1,
-    EMBER_ZCL_FAN_MODE_MEDIUM = 2,
-    EMBER_ZCL_FAN_MODE_HIGH   = 3,
-    EMBER_ZCL_FAN_MODE_ON     = 4,
-    EMBER_ZCL_FAN_MODE_AUTO   = 5,
-    EMBER_ZCL_FAN_MODE_SMART  = 6,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_OFF = 0,
+  EMBER_ZCL_FAN_MODE_LOW = 1,
+  EMBER_ZCL_FAN_MODE_MEDIUM = 2,
+  EMBER_ZCL_FAN_MODE_HIGH = 3,
+  EMBER_ZCL_FAN_MODE_ON = 4,
+  EMBER_ZCL_FAN_MODE_AUTO = 5,
+  EMBER_ZCL_FAN_MODE_SMART = 6,
 } EmberAfFanMode;
 
 // Enum for FanModeSequence
-typedef enum
-{
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH      = 0,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH          = 1,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO     = 3,
-    EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO           = 4,
+typedef enum {
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH = 0,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH = 1,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_MED_HIGH_AUTO = 2,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_LOW_HIGH_AUTO = 3,
+  EMBER_ZCL_FAN_MODE_SEQUENCE_ON_AUTO = 4,
 } EmberAfFanModeSequence;
 
 // Enum for GasSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER           = 96,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED  = 98,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW           = 99,
-    EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED     = 100,
+typedef enum {
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER = 96,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_EXCESS_FLOW = 99,
+  EMBER_ZCL_GAS_SPECIFIC_ALARM_GROUPS_TILT_TAMPER_ENDED = 100,
 } EmberAfGasSpecificAlarmGroups;
 
 // Enum for GeneralCommissioningError
-typedef enum
-{
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK                     = 0,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE    = 1,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC   = 2,
-    EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
+typedef enum {
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_OK = 0,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_VALUE_OUTSIDE_RANGE = 1,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_CANNOT_CHANGE_FABRIC = 2,
+  EMBER_ZCL_GENERAL_COMMISSIONING_ERROR_INVALID_AUTHENTICATION = 3,
 } EmberAfGeneralCommissioningError;
 
 // Enum for GenerationTier
-typedef enum
-{
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE  = 1,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE  = 2,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE  = 3,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE  = 4,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE  = 5,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE  = 6,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE  = 7,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE  = 8,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE  = 9,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
-    EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
+typedef enum {
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER1_SUMMATION_RECEIVED_ATTRIBUTE = 1,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER2_SUMMATION_RECEIVED_ATTRIBUTE = 2,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER3_SUMMATION_RECEIVED_ATTRIBUTE = 3,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER4_SUMMATION_RECEIVED_ATTRIBUTE = 4,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER5_SUMMATION_RECEIVED_ATTRIBUTE = 5,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER6_SUMMATION_RECEIVED_ATTRIBUTE = 6,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER7_SUMMATION_RECEIVED_ATTRIBUTE = 7,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER8_SUMMATION_RECEIVED_ATTRIBUTE = 8,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER9_SUMMATION_RECEIVED_ATTRIBUTE = 9,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER10_SUMMATION_RECEIVED_ATTRIBUTE = 10,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER11_SUMMATION_RECEIVED_ATTRIBUTE = 11,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER12_SUMMATION_RECEIVED_ATTRIBUTE = 12,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER13_SUMMATION_RECEIVED_ATTRIBUTE = 13,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER14_SUMMATION_RECEIVED_ATTRIBUTE = 14,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER15_SUMMATION_RECEIVED_ATTRIBUTE = 15,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER16_SUMMATION_RECEIVED_ATTRIBUTE = 16,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER17_SUMMATION_RECEIVED_ATTRIBUTE = 17,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER18_SUMMATION_RECEIVED_ATTRIBUTE = 18,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER19_SUMMATION_RECEIVED_ATTRIBUTE = 19,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER20_SUMMATION_RECEIVED_ATTRIBUTE = 20,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER21_SUMMATION_RECEIVED_ATTRIBUTE = 21,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER22_SUMMATION_RECEIVED_ATTRIBUTE = 22,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER23_SUMMATION_RECEIVED_ATTRIBUTE = 23,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER24_SUMMATION_RECEIVED_ATTRIBUTE = 24,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER25_SUMMATION_RECEIVED_ATTRIBUTE = 25,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER26_SUMMATION_RECEIVED_ATTRIBUTE = 26,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER27_SUMMATION_RECEIVED_ATTRIBUTE = 27,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER28_SUMMATION_RECEIVED_ATTRIBUTE = 28,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER29_SUMMATION_RECEIVED_ATTRIBUTE = 29,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER30_SUMMATION_RECEIVED_ATTRIBUTE = 30,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER31_SUMMATION_RECEIVED_ATTRIBUTE = 31,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER32_SUMMATION_RECEIVED_ATTRIBUTE = 32,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER33_SUMMATION_RECEIVED_ATTRIBUTE = 33,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER34_SUMMATION_RECEIVED_ATTRIBUTE = 34,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER35_SUMMATION_RECEIVED_ATTRIBUTE = 35,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER36_SUMMATION_RECEIVED_ATTRIBUTE = 36,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER37_SUMMATION_RECEIVED_ATTRIBUTE = 37,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER38_SUMMATION_RECEIVED_ATTRIBUTE = 38,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER39_SUMMATION_RECEIVED_ATTRIBUTE = 39,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER40_SUMMATION_RECEIVED_ATTRIBUTE = 40,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER41_SUMMATION_RECEIVED_ATTRIBUTE = 41,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER42_SUMMATION_RECEIVED_ATTRIBUTE = 42,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER43_SUMMATION_RECEIVED_ATTRIBUTE = 43,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER44_SUMMATION_RECEIVED_ATTRIBUTE = 44,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER45_SUMMATION_RECEIVED_ATTRIBUTE = 45,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER46_SUMMATION_RECEIVED_ATTRIBUTE = 46,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER47_SUMMATION_RECEIVED_ATTRIBUTE = 47,
+  EMBER_ZCL_GENERATION_TIER_CURRENT_TIER48_SUMMATION_RECEIVED_ATTRIBUTE = 48,
 } EmberAfGenerationTier;
 
 // Enum for GenericAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER              = 0,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY              = 1,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT            = 2,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT              = 5,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT       = 6,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED      = 8,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED       = 9,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD    = 10,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE          = 12,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR     = 13,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR                = 14,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR          = 15,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_CHECK_METER = 0,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LOW_BATTERY = 1,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_TAMPER_DETECT = 2,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_LEAK_DETECT = 5,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_BATTERY_FAILURE = 12,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_RAM_ERROR = 14,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_NV_MEMORY_ERROR = 15,
 } EmberAfGenericAlarmGroups;
 
 // Enum for GenericAlarmGroupsElectricity
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_FAILURE = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_ELECTRICITY_POWER_QUALITY = 4,
 } EmberAfGenericAlarmGroupsElectricity;
 
 // Enum for GenericAlarmGroupsGas
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_GAS_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsGas;
 
 // Enum for GenericAlarmGroupsHeatCooling
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT       = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR        = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_BURST_DETECT = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_HEAT_COOLING_FLOW_SENSOR = 7,
 } EmberAfGenericAlarmGroupsHeatCooling;
 
 // Enum for GenericAlarmGroupsWater
-typedef enum
-{
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY   = 3,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
-    EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
+typedef enum {
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_PIPE_EMPTY = 3,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_LOW_PRESSURE = 4,
+  EMBER_ZCL_GENERIC_ALARM_GROUPS_WATER_WATER_REVERSE_FLOW = 7,
 } EmberAfGenericAlarmGroupsWater;
 
 // Enum for GenericDeviceClass
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_CLASS_LIGHTING = 0,
 } EmberAfGenericDeviceClass;
 
 // Enum for GenericDeviceType
-typedef enum
-{
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT               = 0,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN          = 1,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB               = 2,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL                        = 3,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT         = 4,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB                   = 5,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED              = 6,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP                  = 7,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE                   = 8,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE     = 9,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE    = 10,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE            = 11,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE     = 12,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER         = 224,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH                = 225,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR     = 227,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR           = 240,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT                = 241,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR          = 242,
-    EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED                = 255,
+typedef enum {
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_INCANDESCENT = 0,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_HALOGEN = 1,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_HALOGEN_BULB = 2,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_CFL = 3,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LINEAR_FLOURESCENT = 4,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_BULB = 5,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_SPOTLIGHT_LED = 6,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_STRIP = 7,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_LED_TUBE = 8,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_INDOOR_FIXTURE = 9,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_OUTDOOR_FIXTURE = 10,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PENDANT_FIXTURE = 11,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_FLOOR_STANDING_FIXTURE = 12,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_CONTROLLER = 224,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_WALL_SWITCH = 225,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PORTABLE_REMOTE_CONTROLLER = 226,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_MOTION_OR_LIGHT_SENSOR = 227,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_GENERIC_ACTUATOR = 240,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_PLUGIN_UNIT = 241,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_RETROFIT_ACTUATOR = 242,
+  EMBER_ZCL_GENERIC_DEVICE_TYPE_UNSPECIFIED = 255,
 } EmberAfGenericDeviceType;
 
 // Enum for GenericFlowPressureAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT                    = 48,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW                = 49,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH               = 50,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT   = 52,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW        = 53,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT          = 54,
-    EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY                      = 55,
+typedef enum {
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_BURST_DETECT = 48,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_GENERIC_FLOW_PRESSURE_ALARM_GROUPS_PIPE_EMPTY = 55,
 } EmberAfGenericFlowPressureAlarmGroups;
 
 // Enum for GpDeviceId
-typedef enum
-{
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH   = 0,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH                     = 8,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH              = 16,
-    EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR                     = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH               = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR                      = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER              = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR                = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR                   = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR                       = 24,
-    EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR         = 24,
+typedef enum {
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_ONE_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_GENERIC_TWO_STATE_SWITCH = 0,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ON_OFF_SWITCH = 8,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LEVEL_CONTROL_SWITCH = 16,
+  EMBER_ZCL_GP_DEVICE_ID_GP_SIMPLE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_ONE_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_ADVANCED_GENERIC_TWO_STATE_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_COLOR_DIMMER_SWITCH = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_LIGHT_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_OCCPANCY_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_DOOR_LOCK_CONTROLLER = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_TEMPERATURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_PRESSURE_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_FLOW_SENSOR = 24,
+  EMBER_ZCL_GP_DEVICE_ID_GP_INDOOR_ENVIRONMENT_SNESOR = 24,
 } EmberAfGpDeviceId;
 
 // Enum for GpGpdf
-typedef enum
-{
-    EMBER_ZCL_GP_GPDF_IDENTIFY                    = 0,
-    EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS   = 2,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE0               = 16,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE1               = 17,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE2               = 18,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE3               = 19,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE4               = 20,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE5               = 21,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE6               = 22,
-    EMBER_ZCL_GP_GPDF_RECALL_SCENE7               = 23,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE0                = 24,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE1                = 25,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE2                = 26,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE3                = 27,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE4                = 28,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE5                = 29,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE6                = 30,
-    EMBER_ZCL_GP_GPDF_STORE_SCENE7                = 31,
-    EMBER_ZCL_GP_GPDF_OFF                         = 32,
-    EMBER_ZCL_GP_GPDF_ON                          = 33,
-    EMBER_ZCL_GP_GPDF_TOGGLE                      = 34,
-    EMBER_ZCL_GP_GPDF_RELEASE                     = 35,
-    EMBER_ZCL_GP_GPDF_MOVE_UP                     = 48,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN                   = 49,
-    EMBER_ZCL_GP_GPDF_STEP_UP                     = 50,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN                   = 51,
-    EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP          = 52,
-    EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF         = 53,
-    EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF       = 54,
-    EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF         = 55,
-    EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF       = 56,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP               = 64,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_UP                 = 65,
-    EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN               = 66,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_UP                 = 67,
-    EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN               = 68,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP        = 69,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP          = 70,
-    EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN        = 71,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP          = 72,
-    EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN        = 73,
-    EMBER_ZCL_GP_GPDF_MOVE_COLOR                  = 74,
-    EMBER_ZCL_GP_GPDF_STEP_COLOR                  = 75,
-    EMBER_ZCL_GP_GPDF_LOCK_DOOR                   = 80,
-    EMBER_ZCL_GP_GPDF_UNLOCK_DOOR                 = 81,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF1                  = 96,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF1                = 97,
-    EMBER_ZCL_GP_GPDF_PRESS1_OF2                  = 98,
-    EMBER_ZCL_GP_GPDF_RELEASE1_OF2                = 99,
-    EMBER_ZCL_GP_GPDF_PRESS2_OF2                  = 100,
-    EMBER_ZCL_GP_GPDF_RELEASE2_OF2                = 101,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1            = 102,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2            = 103,
-    EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2            = 104,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS          = 105,
-    EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE        = 106,
-    EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING         = 160,
-    EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG            = 161,
-    EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG          = 162,
-    EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG   = 163,
-    EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE           = 164,
-    EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE          = 165,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD  = 166,
-    EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
-    EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD          = 175,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0            = 176,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1            = 177,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2            = 178,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3            = 179,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4            = 180,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5            = 181,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6            = 182,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7            = 183,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8            = 184,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9            = 185,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A           = 186,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B           = 187,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C           = 188,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D           = 189,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E           = 190,
-    EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F           = 191,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING               = 224,
-    EMBER_ZCL_GP_GPDF_DECOMMISSIONING             = 225,
-    EMBER_ZCL_GP_GPDF_SUCCESS                     = 226,
-    EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST             = 227,
-    EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION     = 228,
-    EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY         = 240,
-    EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES            = 241,
-    EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES             = 242,
-    EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION       = 243,
-    EMBER_ZCL_GP_GPDF_ZCL_TUNNELING               = 246,
+typedef enum {
+  EMBER_ZCL_GP_GPDF_IDENTIFY = 0,
+  EMBER_ZCL_GP_GPDF_MATCH_ONLY_ON_GPD_ADDRESS = 2,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE0 = 16,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE1 = 17,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE2 = 18,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE3 = 19,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE4 = 20,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE5 = 21,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE6 = 22,
+  EMBER_ZCL_GP_GPDF_RECALL_SCENE7 = 23,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE0 = 24,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE1 = 25,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE2 = 26,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE3 = 27,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE4 = 28,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE5 = 29,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE6 = 30,
+  EMBER_ZCL_GP_GPDF_STORE_SCENE7 = 31,
+  EMBER_ZCL_GP_GPDF_OFF = 32,
+  EMBER_ZCL_GP_GPDF_ON = 33,
+  EMBER_ZCL_GP_GPDF_TOGGLE = 34,
+  EMBER_ZCL_GP_GPDF_RELEASE = 35,
+  EMBER_ZCL_GP_GPDF_MOVE_UP = 48,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN = 49,
+  EMBER_ZCL_GP_GPDF_STEP_UP = 50,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN = 51,
+  EMBER_ZCL_GP_GPDF_LEVEL_CONTROL_STOP = 52,
+  EMBER_ZCL_GP_GPDF_MOVE_UP_WITH_ON_OFF = 53,
+  EMBER_ZCL_GP_GPDF_MOVE_DOWN_WITH_ON_OFF = 54,
+  EMBER_ZCL_GP_GPDF_STEP_UP_WITH_ON_OFF = 55,
+  EMBER_ZCL_GP_GPDF_STEP_DOWN_WITH_ON_OFF = 56,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_STOP = 64,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_UP = 65,
+  EMBER_ZCL_GP_GPDF_MOVE_HUE_DOWN = 66,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_UP = 67,
+  EMBER_ZCL_GP_GPDF_STEP_HUE_DOWN = 68,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_STOP = 69,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_UP = 70,
+  EMBER_ZCL_GP_GPDF_MOVE_SATURATION_DOWN = 71,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_UP = 72,
+  EMBER_ZCL_GP_GPDF_STEP_SATURATION_DOWN = 73,
+  EMBER_ZCL_GP_GPDF_MOVE_COLOR = 74,
+  EMBER_ZCL_GP_GPDF_STEP_COLOR = 75,
+  EMBER_ZCL_GP_GPDF_LOCK_DOOR = 80,
+  EMBER_ZCL_GP_GPDF_UNLOCK_DOOR = 81,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF1 = 96,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF1 = 97,
+  EMBER_ZCL_GP_GPDF_PRESS1_OF2 = 98,
+  EMBER_ZCL_GP_GPDF_RELEASE1_OF2 = 99,
+  EMBER_ZCL_GP_GPDF_PRESS2_OF2 = 100,
+  EMBER_ZCL_GP_GPDF_RELEASE2_OF2 = 101,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF1 = 102,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS1_OF2 = 103,
+  EMBER_ZCL_GP_GPDF_SHORT_PRESS2_OF2 = 104,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_PRESS = 105,
+  EMBER_ZCL_GP_GPDF_8BITS_VECTOR_RELEASE = 106,
+  EMBER_ZCL_GP_GPDF_ATTRIBUTE_REPORTING = 160,
+  EMBER_ZCL_GP_GPDF_MFR_SP_ATTR_RPTG = 161,
+  EMBER_ZCL_GP_GPDF_MULTI_CLUSTER_RPTG = 162,
+  EMBER_ZCL_GP_GPDF_MFR_SP_MULTI_CLUSTER_RPTG = 163,
+  EMBER_ZCL_GP_GPDF_REQUEST_ATTRIBUTE = 164,
+  EMBER_ZCL_GP_GPDF_READ_ATTR_RESPONSE = 165,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING_WITH_PAYLOAD = 166,
+  EMBER_ZCL_GP_GPDF_COMPACT_ATTRIBUTE_REPORTING = 168,
+  EMBER_ZCL_GP_GPDF_ANY_GPD_SENSOR_CMD = 175,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD0 = 176,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD1 = 177,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD2 = 178,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD3 = 179,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD4 = 180,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD5 = 181,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD6 = 182,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD7 = 183,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD8 = 184,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD9 = 185,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_A = 186,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_B = 187,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_C = 188,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_D = 189,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_E = 190,
+  EMBER_ZCL_GP_GPDF_MFR_DEF_GPD_CMD_F = 191,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING = 224,
+  EMBER_ZCL_GP_GPDF_DECOMMISSIONING = 225,
+  EMBER_ZCL_GP_GPDF_SUCCESS = 226,
+  EMBER_ZCL_GP_GPDF_CHANNEL_REQUEST = 227,
+  EMBER_ZCL_GP_GPDF_APPLICATION_DESCRIPTION = 228,
+  EMBER_ZCL_GP_GPDF_COMMISSIONING_REPLY = 240,
+  EMBER_ZCL_GP_GPDF_WRITE_ATTRIBUTES = 241,
+  EMBER_ZCL_GP_GPDF_READ_ATTRIBUTES = 242,
+  EMBER_ZCL_GP_GPDF_CHANNEL_CONFIGURATION = 243,
+  EMBER_ZCL_GP_GPDF_ZCL_TUNNELING = 246,
 } EmberAfGpGpdf;
 
 // Enum for GpPairingConfigurationAction
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION                = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY  = 1,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING         = 3,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD               = 4,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION  = 5,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_NO_ACTION = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_EXTEND_SINK_TABLE_ENTRY = 1,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REPLACE_SINK_TABLE_ENTRY = 2,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_A_PAIRING = 3,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_REMOVE_GPD = 4,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_ACTION_APPLICATION_DESCRIPTION = 5,
 } EmberAfGpPairingConfigurationAction;
 
 // Enum for GpPairingConfigurationOptionCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING                       = 0,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID       = 8,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
-    EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT           = 24,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 8,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMMISSIONED = 16,
+  EMBER_ZCL_GP_PAIRING_CONFIGURATION_OPTION_COMMUNICATION_MODE_UNICAST_FORWARDING_LIGHTWEIGHT = 24,
 } EmberAfGpPairingConfigurationOptionCommunicationMode;
 
 // Enum for GpPairingOptionsCommunicationMode
-typedef enum
-{
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING               = 0,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID    = 1,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
-    EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT    = 17,
+typedef enum {
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_FULL_UNICAST_FORWARDING = 0,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_D_GROUP_ID = 1,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_GROUPCAST_FORWARDING_TO_PRE_COMM_UNIT = 16,
+  EMBER_ZCL_GP_PAIRING_OPTIONS_COMMUNICATION_MODE_UNICAST_FORWARDING_BY_PROX_SUPPORT = 17,
 } EmberAfGpPairingOptionsCommunicationMode;
 
 // Enum for GpProxyTableRequestOptionsRequestType
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_REQUEST_OPTIONS_REQUEST_TYPE_BY_INDEX = 1,
 } EmberAfGpProxyTableRequestOptionsRequestType;
 
 // Enum for GpProxyTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_PROXY_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpProxyTableResponseStatus;
 
 // Enum for GpSecurityKeyType
-typedef enum
-{
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE                       = 0,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY         = 1,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY              = 2,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY  = 3,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY       = 4,
-    EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
+typedef enum {
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NONE = 0,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_ZIGBEE_NETWORK_KEY = 1,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_GPD_GROUP_KEY = 2,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_NETWORK_DERIVED_GROUP_KEY = 3,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_INDIVIDIGUAL_GPD_KEY = 4,
+  EMBER_ZCL_GP_SECURITY_KEY_TYPE_DERIVED_INDIVIDUAL_GPD_KEY = 7,
 } EmberAfGpSecurityKeyType;
 
 // Enum for GpSinkTableRequestOptions
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
-    EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX  = 1,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_GPD_ID = 0,
+  EMBER_ZCL_GP_SINK_TABLE_REQUEST_OPTIONS_REQUEST_TABLE_ENTRIES_BY_INDEX = 1,
 } EmberAfGpSinkTableRequestOptions;
 
 // Enum for GpSinkTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_SINK_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpSinkTableResponseStatus;
 
 // Enum for GpTranslationTableResponseStatus
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS   = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_SUCCESS = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_RESPONSE_STATUS_NOT_FOUND = 139,
 } EmberAfGpTranslationTableResponseStatus;
 
 // Enum for GpTranslationTableUpdateAction
-typedef enum
-{
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY     = 0,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY  = 16,
-    EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED                        = 24,
+typedef enum {
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_ADD_TRANSLATION_TABLE_ENTRY = 0,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REPLACE_TRANSLATION_TABLE_ENTRY = 8,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_REMOVE_TRANSLATION_TABLE_ENTRY = 16,
+  EMBER_ZCL_GP_TRANSLATION_TABLE_UPDATE_ACTION_RESERVED = 24,
 } EmberAfGpTranslationTableUpdateAction;
 
 // Enum for GroupKeySecurityPolicy
-typedef enum
-{
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD    = 0,
-    EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
+typedef enum {
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_STANDARD = 0,
+  EMBER_ZCL_GROUP_KEY_SECURITY_POLICY_LOW_LATENCY = 1,
 } EmberAfGroupKeySecurityPolicy;
 
 // Enum for HeatAndCoolingSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT  = 80,
-    EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+typedef enum {
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_HEAT_AND_COOLING_SPECIFIC_ALARM_GROUPS_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
 } EmberAfHeatAndCoolingSpecificAlarmGroups;
 
 // Enum for HueDirection
-typedef enum
-{
-    EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
-    EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE  = 1,
-    EMBER_ZCL_HUE_DIRECTION_UP                = 2,
-    EMBER_ZCL_HUE_DIRECTION_DOWN              = 3,
+typedef enum {
+  EMBER_ZCL_HUE_DIRECTION_SHORTEST_DISTANCE = 0,
+  EMBER_ZCL_HUE_DIRECTION_LONGEST_DISTANCE = 1,
+  EMBER_ZCL_HUE_DIRECTION_UP = 2,
+  EMBER_ZCL_HUE_DIRECTION_DOWN = 3,
 } EmberAfHueDirection;
 
 // Enum for HueMoveMode
-typedef enum
-{
-    EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_HUE_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_HUE_MOVE_MODE_UP = 1,
+  EMBER_ZCL_HUE_MOVE_MODE_DOWN = 3,
 } EmberAfHueMoveMode;
 
 // Enum for HueStepMode
-typedef enum
-{
-    EMBER_ZCL_HUE_STEP_MODE_UP   = 1,
-    EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_HUE_STEP_MODE_UP = 1,
+  EMBER_ZCL_HUE_STEP_MODE_DOWN = 3,
 } EmberAfHueStepMode;
 
 // Enum for IasAceAlarmStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM        = 0,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR         = 1,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE            = 2,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY       = 3,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC    = 4,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC      = 5,
-    EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_NO_ALARM = 0,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_BURGLAR = 1,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE = 2,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY = 3,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_POLICE_PANIC = 4,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_FIRE_PANIC = 5,
+  EMBER_ZCL_IAS_ACE_ALARM_STATUS_EMERGENCY_PANIC = 6,
 } EmberAfIasAceAlarmStatus;
 
 // Enum for IasAceArmMode
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM                     = 0,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
-    EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES              = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_MODE_DISARM = 0,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_DAY_HOME_ZONES_ONLY = 1,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_NIGHT_SLEEP_ZONES_ONLY = 2,
+  EMBER_ZCL_IAS_ACE_ARM_MODE_ARM_ALL_ZONES = 3,
 } EmberAfIasAceArmMode;
 
 // Enum for IasAceArmNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED           = 0,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED    = 1,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED              = 3,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE      = 4,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM             = 5,
-    EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED             = 6,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_DAY_HOME_ZONES_ARMED = 1,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ONLY_NIGHT_SLEEP_ZONES_ARMED = 2,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALL_ZONES_ARMED = 3,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_INVALID_ARM_DISARM_CODE = 4,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_NOT_READY_TO_ARM = 5,
+  EMBER_ZCL_IAS_ACE_ARM_NOTIFICATION_ALREADY_DISARMED = 6,
 } EmberAfIasAceArmNotification;
 
 // Enum for IasAceAudibleNotification
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE          = 0,
-    EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_MUTE = 0,
+  EMBER_ZCL_IAS_ACE_AUDIBLE_NOTIFICATION_DEFAULT_SOUND = 1,
 } EmberAfIasAceAudibleNotification;
 
 // Enum for IasAceBypassResult
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED           = 0,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED       = 1,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED             = 2,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID         = 3,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID         = 4,
-    EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_BYPASSED = 0,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_ZONE_NOT_BYPASSED = 1,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_NOT_ALLOWED = 2,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ZONE_ID = 3,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_UNKNOWN_ZONE_ID = 4,
+  EMBER_ZCL_IAS_ACE_BYPASS_RESULT_INVALID_ARM_DISARM_CODE = 5,
 } EmberAfIasAceBypassResult;
 
 // Enum for IasAcePanelStatus
-typedef enum
-{
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED   = 0,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY       = 1,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT      = 2,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY       = 3,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY       = 4,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY      = 5,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM         = 7,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY      = 8,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT     = 9,
-    EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY      = 10,
+typedef enum {
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_PANEL_DISARMED = 0,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_STAY = 1,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_NIGHT = 2,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMED_AWAY = 3,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_EXIT_DELAY = 4,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ENTRY_DELAY = 5,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_NOT_READY_TO_ARM = 6,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_IN_ALARM = 7,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_STAY = 8,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_NIGHT = 9,
+  EMBER_ZCL_IAS_ACE_PANEL_STATUS_ARMING_AWAY = 10,
 } EmberAfIasAcePanelStatus;
 
 // Enum for IasEnrollResponseCode
-typedef enum
-{
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS          = 0,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED    = 1,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
-    EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES   = 3,
+typedef enum {
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_SUCCESS = 0,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_NO_ENROLL_PERMIT = 2,
+  EMBER_ZCL_IAS_ENROLL_RESPONSE_CODE_TOO_MANY_ZONES = 3,
 } EmberAfIasEnrollResponseCode;
 
 // Enum for IasZoneState
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
-    EMBER_ZCL_IAS_ZONE_STATE_ENROLLED     = 1,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_STATE_NOT_ENROLLED = 0,
+  EMBER_ZCL_IAS_ZONE_STATE_ENROLLED = 1,
 } EmberAfIasZoneState;
 
 // Enum for IasZoneType
-typedef enum
-{
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE              = 0,
-    EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR             = 13,
-    EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH            = 21,
-    EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR               = 40,
-    EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR              = 42,
-    EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR                = 43,
-    EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
-    EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
-    EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL            = 271,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB                   = 277,
-    EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD                    = 541,
-    EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE   = 549,
-    EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR        = 550,
-    EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR    = 551,
-    EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER         = 553,
-    EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE         = 65535,
+typedef enum {
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_CIE = 0,
+  EMBER_ZCL_IAS_ZONE_TYPE_MOTION_SENSOR = 13,
+  EMBER_ZCL_IAS_ZONE_TYPE_CONTACT_SWITCH = 21,
+  EMBER_ZCL_IAS_ZONE_TYPE_FIRE_SENSOR = 40,
+  EMBER_ZCL_IAS_ZONE_TYPE_WATER_SENSOR = 42,
+  EMBER_ZCL_IAS_ZONE_TYPE_GAS_SENSOR = 43,
+  EMBER_ZCL_IAS_ZONE_TYPE_PERSONAL_EMERGENCY_DEVICE = 44,
+  EMBER_ZCL_IAS_ZONE_TYPE_VIBRATION_MOVEMENT_SENSOR = 45,
+  EMBER_ZCL_IAS_ZONE_TYPE_REMOTE_CONTROL = 271,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEY_FOB = 277,
+  EMBER_ZCL_IAS_ZONE_TYPE_KEYPAD = 541,
+  EMBER_ZCL_IAS_ZONE_TYPE_STANDARD_WARNING_DEVICE = 549,
+  EMBER_ZCL_IAS_ZONE_TYPE_GLASS_BREAK_SENSOR = 550,
+  EMBER_ZCL_IAS_ZONE_TYPE_CARBON_MONOXIDE_SENSOR = 551,
+  EMBER_ZCL_IAS_ZONE_TYPE_SECURITY_REPEATER = 553,
+  EMBER_ZCL_IAS_ZONE_TYPE_INVALID_ZONE_TYPE = 65535,
 } EmberAfIasZoneType;
 
 // Enum for IdentifyEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK          = 0,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE        = 1,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY           = 2,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT  = 254,
-    EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT    = 255,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BLINK = 0,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_BREATHE = 1,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_OKAY = 2,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_CHANNEL_CHANGE = 11,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_FINISH_EFFECT = 254,
+  EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT = 255,
 } EmberAfIdentifyEffectIdentifier;
 
 // Enum for IdentifyEffectVariant
-typedef enum
-{
-    EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
+typedef enum {
+  EMBER_ZCL_IDENTIFY_EFFECT_VARIANT_DEFAULT = 0,
 } EmberAfIdentifyEffectVariant;
 
 // Enum for KeyIndex
-typedef enum
-{
-    EMBER_ZCL_KEY_INDEX_DEVELOPMENT   = 0,
-    EMBER_ZCL_KEY_INDEX_MASTER        = 4,
-    EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
+typedef enum {
+  EMBER_ZCL_KEY_INDEX_DEVELOPMENT = 0,
+  EMBER_ZCL_KEY_INDEX_MASTER = 4,
+  EMBER_ZCL_KEY_INDEX_CERTIFICATION = 15,
 } EmberAfKeyIndex;
 
 // Enum for KeypadInputStatus
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS                      = 0,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY              = 1,
-    EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
+typedef enum {
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_SUCCESS = 0,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_UNSUPPORTED_KEY = 1,
+  EMBER_ZCL_KEYPAD_INPUT_STATUS_INVALID_KEY_IN_CURRENT_STATE = 2,
 } EmberAfKeypadInputStatus;
 
 // Enum for KeypadLockout
-typedef enum
-{
-    EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT          = 0,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT   = 1,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT   = 2,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT  = 4,
-    EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT   = 5,
+typedef enum {
+  EMBER_ZCL_KEYPAD_LOCKOUT_NO_LOCKOUT = 0,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_ONE_LOCKOUT = 1,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_TWO_LOCKOUT = 2,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_THREE_LOCKOUT = 3,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVEL_FOUR_LOCKOUT = 4,
+  EMBER_ZCL_KEYPAD_LOCKOUT_LEVELFIVE_LOCKOUT = 5,
 } EmberAfKeypadLockout;
 
 // Enum for LevelControlOptions
-typedef enum
-{
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF             = 1,
-    EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_EXECUTE_IF_OFF = 1,
+  EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL = 2,
 } EmberAfLevelControlOptions;
 
 // Enum for LevelStatus
-typedef enum
-{
-    EMBER_ZCL_LEVEL_STATUS_ON_TARGET    = 0,
-    EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
-    EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
+typedef enum {
+  EMBER_ZCL_LEVEL_STATUS_ON_TARGET = 0,
+  EMBER_ZCL_LEVEL_STATUS_BELOW_TARGET = 1,
+  EMBER_ZCL_LEVEL_STATUS_ABOVE_TARGET = 2,
 } EmberAfLevelStatus;
 
 // Enum for LocationMethod
-typedef enum
-{
-    EMBER_ZCL_LOCATION_METHOD_LATERATION        = 0,
-    EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING       = 1,
-    EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
-    EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND       = 3,
+typedef enum {
+  EMBER_ZCL_LOCATION_METHOD_LATERATION = 0,
+  EMBER_ZCL_LOCATION_METHOD_SIGNPOSTING = 1,
+  EMBER_ZCL_LOCATION_METHOD_RF_FINGERPRINTING = 2,
+  EMBER_ZCL_LOCATION_METHOD_OUT_OF_BAND = 3,
 } EmberAfLocationMethod;
 
 // Enum for ManufacturerSpecificAlarmGroups
-typedef enum
-{
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
-    EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
+typedef enum {
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_MANUFACTURER_SPECIFIC_ALARM_GROUPS_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfManufacturerSpecificAlarmGroups;
 
 // Enum for MeasurementLightSensorType
-typedef enum
-{
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_MEASUREMENT_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfMeasurementLightSensorType;
 
 // Enum for MediaInputType
-typedef enum
-{
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL  = 0,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_AUX       = 1,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COAX      = 2,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI      = 4,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT     = 5,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_LINE      = 6,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL   = 7,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO     = 8,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_SCART     = 9,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_USB       = 10,
-    EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER     = 11,
+typedef enum {
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INTERNAL = 0,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_AUX = 1,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COAX = 2,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_COMPOSITE = 3,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI = 4,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_INPUT = 5,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_LINE = 6,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OPTICAL = 7,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_VIDEO = 8,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_SCART = 9,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_USB = 10,
+  EMBER_ZCL_MEDIA_INPUT_TYPE_OTHER = 11,
 } EmberAfMediaInputType;
 
 // Enum for MessagingControlConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED = 128,
 } EmberAfMessagingControlConfirmation;
 
 // Enum for MessagingControlEnhancedConfirmation
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED = 32,
 } EmberAfMessagingControlEnhancedConfirmation;
 
 // Enum for MessagingControlImportance
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
-    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM = 4,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH = 8,
+  EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
 } EmberAfMessagingControlImportance;
 
 // Enum for MessagingControlTransmission
-typedef enum
-{
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
-    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+typedef enum {
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL = 0,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS = 2,
+  EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED = 3,
 } EmberAfMessagingControlTransmission;
 
 // Enum for MeterDeviceType
-typedef enum
-{
-    EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER          = 0,
-    EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER               = 1,
-    EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER             = 2,
-    EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER           = 3,
-    EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER          = 4,
-    EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER              = 5,
-    EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER           = 6,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER      = 128,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER    = 129,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER  = 130,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER     = 132,
-    EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER  = 133,
-    EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER  = 254,
+typedef enum {
+  EMBER_ZCL_METER_DEVICE_TYPE_ELECTRIC_METER = 0,
+  EMBER_ZCL_METER_DEVICE_TYPE_GAS_METER = 1,
+  EMBER_ZCL_METER_DEVICE_TYPE_WATER_METER = 2,
+  EMBER_ZCL_METER_DEVICE_TYPE_THERMAL_METER = 3,
+  EMBER_ZCL_METER_DEVICE_TYPE_PRESSURE_METER = 4,
+  EMBER_ZCL_METER_DEVICE_TYPE_HEAT_METER = 5,
+  EMBER_ZCL_METER_DEVICE_TYPE_COOLING_METER = 6,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_GAS_METER = 128,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_WATER_METER = 129,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_THERMAL_METER = 130,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_PRESSURE_METER = 131,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_HEAT_METER = 132,
+  EMBER_ZCL_METER_DEVICE_TYPE_MIRRORED_COOLING_METER = 133,
+  EMBER_ZCL_METER_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeterDeviceType;
 
 // Enum for MeterTypeId
-typedef enum
-{
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER    = 0,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
-    EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER  = 2,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER    = 256,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
-    EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
-    EMBER_ZCL_METER_TYPE_ID_GENERIC_METER            = 272,
+typedef enum {
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRIMARY_METER = 0,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_PRODUCTION_METER = 1,
+  EMBER_ZCL_METER_TYPE_ID_UTILITY_SECONDARY_METER = 2,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRIMARY_METER = 256,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_PRODUCTION_METER = 257,
+  EMBER_ZCL_METER_TYPE_ID_PRIVATE_SECONDARY_METERS = 258,
+  EMBER_ZCL_METER_TYPE_ID_GENERIC_METER = 272,
 } EmberAfMeterTypeId;
 
 // Enum for MeteringAlarmCode
-typedef enum
-{
-    EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER                                  = 0,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY                                  = 1,
-    EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT                                = 2,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR  = 3,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT      = 4,
-    EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT                                  = 5,
-    EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT                           = 6,
-    EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR                     = 7,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED                          = 8,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED                           = 9,
-    EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD                        = 10,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD                     = 11,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE                              = 12,
-    EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR                         = 13,
-    EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR                                    = 14,
-    EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR                              = 15,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1                               = 16,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1                              = 17,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2                               = 18,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2                              = 19,
-    EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3                               = 20,
-    EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3                              = 21,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1                              = 22,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2                              = 23,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3                              = 24,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1                         = 25,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1                        = 26,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2                         = 27,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2                        = 28,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3                         = 29,
-    EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3                        = 30,
-    EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT                                 = 31,
-    EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT                       = 32,
-    EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY                           = 33,
-    EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE                           = 34,
-    EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE                                = 35,
-    EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE                                 = 36,
-    EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE                               = 37,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD                           = 38,
-    EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD                           = 39,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED                       = 40,
-    EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED                        = 41,
-    EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT                                 = 48,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW                             = 49,
-    EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH                            = 50,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR              = 51,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT                = 52,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW                     = 53,
-    EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT                       = 54,
-    EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY                                   = 55,
-    EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT               = 80,
-    EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT              = 81,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER                                  = 96,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED                        = 97,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED                         = 98,
-    EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW                                  = 99,
-    EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED                            = 100,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR                     = 112,
-    EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR                               = 113,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE                    = 114,
-    EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE                       = 115,
-    EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED                  = 116,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED                                  = 117,
-    EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED                                 = 118,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD                           = 119,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD                            = 120,
-    EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID                                = 121,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN                      = 122,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN                        = 123,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT                          = 124,
-    EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS                                   = 125,
-    EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC                          = 126,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE                      = 127,
-    EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT        = 128,
-    EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR                              = 129,
-    EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR                              = 130,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET                          = 131,
-    EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION                 = 132,
-    EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED                            = 133,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED                     = 134,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK                           = 135,
-    EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED                      = 136,
-    EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED                      = 137,
-    EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED                              = 138,
-    EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED                       = 139,
-    EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING                              = 140,
-    EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE                              = 141,
-    EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE                                 = 142,
-    EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN                  = 143,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START                           = 144,
-    EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END                             = 145,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED             = 146,
-    EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT                  = 147,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED         = 148,
-    EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED          = 149,
-    EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A                      = 176,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B                      = 177,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C                      = 178,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D                      = 179,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E                      = 180,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F                      = 181,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G                      = 182,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H                      = 183,
-    EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I                      = 184,
+typedef enum {
+  EMBER_ZCL_METERING_ALARM_CODE_CHECK_METER = 0,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_BATTERY = 1,
+  EMBER_ZCL_METERING_ALARM_CODE_TAMPER_DETECT = 2,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_FAILURE_PIPE_EMPTY_TEMPERATURE_SENSOR = 3,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_QUALITY_LOW_PRESSURE_BURST_DETECT = 4,
+  EMBER_ZCL_METERING_ALARM_CODE_LEAK_DETECT = 5,
+  EMBER_ZCL_METERING_ALARM_CODE_SERVICE_DISCONNECT = 6,
+  EMBER_ZCL_METERING_ALARM_CODE_REVERSE_FLOW_FLOW_SENSOR = 7,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_REMOVED = 8,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_COVER_CLOSED = 9,
+  EMBER_ZCL_METERING_ALARM_CODE_STRONG_MAGNETIC_FIELD = 10,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_STRONG_MAGNETIC_FIELD = 11,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_FAILURE = 12,
+  EMBER_ZCL_METERING_ALARM_CODE_PROGRAM_MEMORY_ERROR = 13,
+  EMBER_ZCL_METERING_ALARM_CODE_RAM_ERROR = 14,
+  EMBER_ZCL_METERING_ALARM_CODE_NV_MEMORY_ERROR = 15,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L1 = 16,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L1 = 17,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L2 = 18,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L2 = 19,
+  EMBER_ZCL_METERING_ALARM_CODE_LOW_VOLTAGE_L3 = 20,
+  EMBER_ZCL_METERING_ALARM_CODE_HIGH_VOLTAGE_L3 = 21,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L1 = 22,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L2 = 23,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_CURRENT_L3 = 24,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L1 = 25,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L1 = 26,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L2 = 27,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L2 = 28,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_LOW_L3 = 29,
+  EMBER_ZCL_METERING_ALARM_CODE_FREQUENCY_TOO_HIGH_L3 = 30,
+  EMBER_ZCL_METERING_ALARM_CODE_GROUND_FAULT = 31,
+  EMBER_ZCL_METERING_ALARM_CODE_ELECTRIC_TAMPER_DETECT = 32,
+  EMBER_ZCL_METERING_ALARM_CODE_INCORRECT_POLARITY = 33,
+  EMBER_ZCL_METERING_ALARM_CODE_CURRENT_NO_VOLTAGE = 34,
+  EMBER_ZCL_METERING_ALARM_CODE_UNDER_VOLTAGE = 35,
+  EMBER_ZCL_METERING_ALARM_CODE_OVER_VOLTAGE = 36,
+  EMBER_ZCL_METERING_ALARM_CODE_NORMAL_VOLTAGE = 37,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_BELOW_THRESHOLD = 38,
+  EMBER_ZCL_METERING_ALARM_CODE_PF_ABOVE_THRESHOLD = 39,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_REMOVED = 40,
+  EMBER_ZCL_METERING_ALARM_CODE_TERMINAL_COVER_CLOSED = 41,
+  EMBER_ZCL_METERING_ALARM_CODE_BURST_DETECT = 48,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_LOW = 49,
+  EMBER_ZCL_METERING_ALARM_CODE_PRESSURE_TOO_HIGH = 50,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_COMMUNICATION_ERROR = 51,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_MEASUREMENT_FAULT = 52,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_REVERSE_FLOW = 53,
+  EMBER_ZCL_METERING_ALARM_CODE_FLOW_SENSOR_AIR_DETECT = 54,
+  EMBER_ZCL_METERING_ALARM_CODE_PIPE_EMPTY = 55,
+  EMBER_ZCL_METERING_ALARM_CODE_INLET_TEMPERATURE_SENSOR_FAULT = 80,
+  EMBER_ZCL_METERING_ALARM_CODE_OUTLET_TEMPERATURE_SENSOR_FAULT = 81,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER = 96,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_REMOVED = 97,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_COVER_CLOSED = 98,
+  EMBER_ZCL_METERING_ALARM_CODE_EXCESS_FLOW = 99,
+  EMBER_ZCL_METERING_ALARM_CODE_TILT_TAMPER_ENDED = 100,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASUREMENT_SYSTEM_ERROR = 112,
+  EMBER_ZCL_METERING_ALARM_CODE_WATCHDOG_ERROR = 113,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_DISCONNECT_FAILURE = 114,
+  EMBER_ZCL_METERING_ALARM_CODE_SUPPLY_CONNECT_FAILURE = 115,
+  EMBER_ZCL_METERING_ALARM_CODE_MEASURMENT_SOFTWARE_CHANGED = 116,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_ENABLED = 117,
+  EMBER_ZCL_METERING_ALARM_CODE_DST_DISABLED = 118,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_BACKWARD = 119,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_ADJ_FORWARD = 120,
+  EMBER_ZCL_METERING_ALARM_CODE_CLOCK_INVALID = 121,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_ERROR_HAN = 122,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMUNICATION_OK_H_AN = 123,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_FRAUD_ATTEMPT = 124,
+  EMBER_ZCL_METERING_ALARM_CODE_POWER_LOSS = 125,
+  EMBER_ZCL_METERING_ALARM_CODE_UNUSUAL_HAN_TRAFFIC = 126,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_CLOCK_CHANGE = 127,
+  EMBER_ZCL_METERING_ALARM_CODE_COMMS_USING_UNAUTHENTICATED_COMPONENT = 128,
+  EMBER_ZCL_METERING_ALARM_CODE_ERROR_REG_CLEAR = 129,
+  EMBER_ZCL_METERING_ALARM_CODE_ALARM_REG_CLEAR = 130,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_HW_RESET = 131,
+  EMBER_ZCL_METERING_ALARM_CODE_UNEXPECTED_PROGRAM_EXECUTION = 132,
+  EMBER_ZCL_METERING_ALARM_CODE_EVENT_LOG_CLEARED = 133,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_EXCEEDED = 134,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_OK = 135,
+  EMBER_ZCL_METERING_ALARM_CODE_LIMIT_THRESHOLD_CHANGED = 136,
+  EMBER_ZCL_METERING_ALARM_CODE_MAXIMUM_DEMAND_EXCEEDED = 137,
+  EMBER_ZCL_METERING_ALARM_CODE_PROFILE_CLEARED = 138,
+  EMBER_ZCL_METERING_ALARM_CODE_SAMPLING_BUFFERCLEARED = 139,
+  EMBER_ZCL_METERING_ALARM_CODE_BATTERY_WARNING = 140,
+  EMBER_ZCL_METERING_ALARM_CODE_WRONG_SIGNATURE = 141,
+  EMBER_ZCL_METERING_ALARM_CODE_NO_SIGNATURE = 142,
+  EMBER_ZCL_METERING_ALARM_CODE_UNAUTHORISED_ACTIONFROM_HAN = 143,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_START = 144,
+  EMBER_ZCL_METERING_ALARM_CODE_FAST_POLLING_END = 145,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_REPORTING_INTERVAL_CHANGED = 146,
+  EMBER_ZCL_METERING_ALARM_CODE_DISCONNECT_DUETO_LOAD_LIMIT = 147,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_SUPPLY_STATUS_REGISTER_CHANGED = 148,
+  EMBER_ZCL_METERING_ALARM_CODE_METER_ALARM_STATUS_REGISTER_CHANGED = 149,
+  EMBER_ZCL_METERING_ALARM_CODE_EXTENDED_METER_ALARM_STATUS_REGISTER_CHANGED = 150,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_A = 176,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_B = 177,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_C = 178,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_D = 179,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_E = 180,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_F = 181,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_G = 182,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_H = 183,
+  EMBER_ZCL_METERING_ALARM_CODE_MANUFACTURER_SPECIFIC_I = 184,
 } EmberAfMeteringAlarmCode;
 
 // Enum for MeteringBlockEnumerations
-typedef enum
-{
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1           = 1,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2           = 2,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3           = 3,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4           = 4,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5           = 5,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6           = 6,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7           = 7,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8           = 8,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9           = 9,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10          = 10,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11          = 11,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12          = 12,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13          = 13,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14          = 14,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15          = 15,
-    EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16          = 16,
+typedef enum {
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_NO_BLOCKS_IN_USE = 0,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK1 = 1,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK2 = 2,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK3 = 3,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK4 = 4,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK5 = 5,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK6 = 6,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK7 = 7,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK8 = 8,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK9 = 9,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK10 = 10,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK11 = 11,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK12 = 12,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK13 = 13,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK14 = 14,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK15 = 15,
+  EMBER_ZCL_METERING_BLOCK_ENUMERATIONS_BLOCK16 = 16,
 } EmberAfMeteringBlockEnumerations;
 
 // Enum for MeteringConsumptionStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE    = 0,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
-    EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE   = 2,
+typedef enum {
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_LOW_ENERGY_USAGE = 0,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_MEDIUM_ENERGY_USAGE = 1,
+  EMBER_ZCL_METERING_CONSUMPTION_STATUS_HIGH_ENERGY_USAGE = 2,
 } EmberAfMeteringConsumptionStatus;
 
 // Enum for MeteringDeviceType
-typedef enum
-{
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING                            = 0,
-    EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING                                 = 1,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING                               = 2,
-    EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING                             = 3,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING                            = 4,
-    EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING                                = 5,
-    EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING                             = 6,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING           = 7,
-    EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING                       = 8,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING             = 9,
-    EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING            = 10,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING                    = 11,
-    EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING          = 12,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1                   = 13,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2                   = 14,
-    EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3                   = 15,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING                   = 127,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING                        = 128,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING                      = 129,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING                    = 130,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING                   = 131,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING                       = 132,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING                    = 133,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING  = 134,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING              = 135,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING    = 136,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING   = 137,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING           = 138,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1          = 140,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2          = 141,
-    EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3          = 142,
-    EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER                       = 254,
+typedef enum {
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING = 0,
+  EMBER_ZCL_METERING_DEVICE_TYPE_GAS_METERING = 1,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_METERING = 2,
+  EMBER_ZCL_METERING_DEVICE_TYPE_THERMAL_METERING = 3,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PRESSURE_METERING = 4,
+  EMBER_ZCL_METERING_DEVICE_TYPE_HEAT_METERING = 5,
+  EMBER_ZCL_METERING_DEVICE_TYPE_COOLING_METERING = 6,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_VEHICLE_CHARGING_METERING = 7,
+  EMBER_ZCL_METERING_DEVICE_TYPE_PV_GENERATION_METERING = 8,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WIND_TURBINE_GENERATION_METERING = 9,
+  EMBER_ZCL_METERING_DEVICE_TYPE_WATER_TURBINE_GENERATION_METERING = 10,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MICRO_GENERATION_METERING = 11,
+  EMBER_ZCL_METERING_DEVICE_TYPE_SOLAR_HOT_WATER_GENERATION_METERING = 12,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT1 = 13,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT2 = 14,
+  EMBER_ZCL_METERING_DEVICE_TYPE_ELECTRIC_METERING_ELEMENT3 = 15,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING = 127,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_GAS_METERING = 128,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_METERING = 129,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_THERMAL_METERING = 130,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PRESSURE_METERING = 131,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_HEAT_METERING = 132,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_COOLING_METERING = 133,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_VEHICLE_CHARGING_METERING = 134,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_PV_GENERATION_METERING = 135,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WIND_TURBINE_GENERATION_METERING = 136,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_WATER_TURBINE_GENERATION_METERING = 137,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_MICRO_GENERATION_METERING = 138,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_SOLAR_HOT_WATER_GENERATION_METERING = 139,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT1 = 140,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT2 = 141,
+  EMBER_ZCL_METERING_DEVICE_TYPE_MIRRORED_ELECTRIC_METERING_ELEMENT3 = 142,
+  EMBER_ZCL_METERING_DEVICE_TYPE_UNDEFINED_MIRROR_METER = 254,
 } EmberAfMeteringDeviceType;
 
 // Enum for MeteringSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_METERING_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfMeteringSupplyStatus;
 
 // Enum for MeteringTemperatureUnitOfMeasure
-typedef enum
-{
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN         = 0,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS        = 1,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT     = 2,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD     = 128,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD    = 129,
-    EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
+typedef enum {
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN = 0,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS = 1,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT = 2,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_KELVIN_BCD = 128,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_CELSIUS_BCD = 129,
+  EMBER_ZCL_METERING_TEMPERATURE_UNIT_OF_MEASURE_FAHRENHEIT_BCD = 130,
 } EmberAfMeteringTemperatureUnitOfMeasure;
 
 // Enum for MoveMode
-typedef enum
-{
-    EMBER_ZCL_MOVE_MODE_UP   = 0,
-    EMBER_ZCL_MOVE_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_MOVE_MODE_UP = 0,
+  EMBER_ZCL_MOVE_MODE_DOWN = 1,
 } EmberAfMoveMode;
 
 // Enum for NavigateTargetStatus
-typedef enum
-{
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS           = 0,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
-    EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY       = 2,
+typedef enum {
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SUCCESS = 0,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_APP_NOT_AVAILABLE = 1,
+  EMBER_ZCL_NAVIGATE_TARGET_STATUS_SYSTEM_BUSY = 2,
 } EmberAfNavigateTargetStatus;
 
 // Enum for NetworkCommissioningError
-typedef enum
-{
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS                  = 0,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE             = 1,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED          = 2,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND     = 3,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID     = 4,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND        = 5,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR         = 6,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE             = 7,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY     = 8,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED              = 10,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED           = 11,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9                   = 12,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10                  = 13,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11                  = 14,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12                  = 15,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13                  = 16,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14                  = 17,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15                  = 18,
-    EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR            = 19,
+typedef enum {
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_SUCCESS = 0,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OUT_OF_RANGE = 1,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_BOUNDS_EXCEEDED = 2,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_ID_NOT_FOUND = 3,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_DUPLICATE_NETWORK_ID = 4,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_NETWORK_NOT_FOUND = 5,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_REGULATORY_ERROR = 6,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_AUTH_FAILURE = 7,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNSUPPORTED_SECURITY = 8,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_OTHER_CONNECTION_FAILURE = 9,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IPV6_FAILED = 10,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_IP_BIND_FAILED = 11,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL9 = 12,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL10 = 13,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL11 = 14,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL12 = 15,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL13 = 16,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL14 = 17,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_LABEL15 = 18,
+  EMBER_ZCL_NETWORK_COMMISSIONING_ERROR_UNKNOWN_ERROR = 19,
 } EmberAfNetworkCommissioningError;
 
 // Enum for NotificationScheme
-typedef enum
-{
-    EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED   = 0,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
-    EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
+typedef enum {
+  EMBER_ZCL_NOTIFICATION_SCHEME_NO_NOTIFICATION_SCHEME_DEFINED = 0,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_A = 1,
+  EMBER_ZCL_NOTIFICATION_SCHEME_PREDEFINED_NOTIFICATION_SCHEME_B = 2,
 } EmberAfNotificationScheme;
 
 // Enum for OccupancySensorType
-typedef enum
-{
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR                = 0,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC         = 1,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
-    EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT   = 3,
+typedef enum {
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR = 0,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_ULTRASONIC = 1,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PIR_AND_ULTRASONIC = 2,
+  EMBER_ZCL_OCCUPANCY_SENSOR_TYPE_PHYSICAL_CONTACT = 3,
 } EmberAfOccupancySensorType;
 
 // Enum for OnOffDelayedAllOffEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS                                        = 0,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE                                                           = 1,
-    EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_FADE_TO_OFF_IN_0P8_SECONDS = 0,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_NO_FADE = 1,
+  EMBER_ZCL_ON_OFF_DELAYED_ALL_OFF_EFFECT_VARIANT_50_PERCENT_DIM_DOWN_IN_0P8_SECONDS_THEN_FADE_TO_OFF_IN_12_SECONDS = 2,
 } EmberAfOnOffDelayedAllOffEffectVariant;
 
 // Enum for OnOffDyingLightEffectVariant
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
+typedef enum {
+  EMBER_ZCL_ON_OFF_DYING_LIGHT_EFFECT_VARIANT_20_PERCENTER_DIM_UP_IN_0P5_SECONDS_THEN_FADE_TO_OFF_IN_1_SECOND = 0,
 } EmberAfOnOffDyingLightEffectVariant;
 
 // Enum for OnOffEffectIdentifier
-typedef enum
-{
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
-    EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
+typedef enum {
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DELAYED_ALL_OFF = 0,
+  EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT = 1,
 } EmberAfOnOffEffectIdentifier;
 
 // Enum for OperatingMode
-typedef enum
-{
-    EMBER_ZCL_OPERATING_MODE_NORMAL    = 0,
-    EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
+typedef enum {
+  EMBER_ZCL_OPERATING_MODE_NORMAL = 0,
+  EMBER_ZCL_OPERATING_MODE_CONFIGURE = 1,
 } EmberAfOperatingMode;
 
 // Enum for OriginatingDevice
-typedef enum
-{
-    EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
-    EMBER_ZCL_ORIGINATING_DEVICE_METER                    = 1,
-    EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE   = 2,
+typedef enum {
+  EMBER_ZCL_ORIGINATING_DEVICE_ENERGY_SERVICE_INTERFACE = 0,
+  EMBER_ZCL_ORIGINATING_DEVICE_METER = 1,
+  EMBER_ZCL_ORIGINATING_DEVICE_IN_HOME_DISPLAY_DEVICE = 2,
 } EmberAfOriginatingDevice;
 
 // Enum for PasswordType
-typedef enum
-{
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS  = 1,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD3                      = 3,
-    EMBER_ZCL_PASSWORD_TYPE_PASSWORD4                      = 4,
+typedef enum {
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD1_SERVICE_MENU_ACCESS = 1,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD2_CONSUMER_MENU_ACCESS = 2,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD3 = 3,
+  EMBER_ZCL_PASSWORD_TYPE_PASSWORD4 = 4,
 } EmberAfPasswordType;
 
 // Enum for PaymentDiscountDuration
-typedef enum
-{
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD    = 0,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH                 = 2,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER               = 3,
-    EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR                  = 4,
+typedef enum {
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_BILLING_PERIOD = 0,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_CURRENT_CONSOLIDATED_BILL = 1,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_MONTH = 2,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_QUARTER = 3,
+  EMBER_ZCL_PAYMENT_DISCOUNT_DURATION_ONE_YEAR = 4,
 } EmberAfPaymentDiscountDuration;
 
 // Enum for PhysicalEnvironment
-typedef enum
-{
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED                   = 0,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE  = 127,
-    EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN                       = 255,
+typedef enum {
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNSPECIFIED = 0,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_FIRST_PROFILE_SPECIFIED_VALUE = 1,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_LAST_PROFILE_SPECIFIED_VALUE = 127,
+  EMBER_ZCL_PHYSICAL_ENVIRONMENT_UNKNOWN = 255,
 } EmberAfPhysicalEnvironment;
 
 // Enum for PowerProfileState
-typedef enum
-{
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED          = 2,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING           = 3,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED             = 4,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START  = 5,
-    EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED           = 6,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED            = 7,
-    EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING   = 8,
-    EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED        = 9,
+typedef enum {
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_WAITING_TO_START = 1,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_STARTED = 2,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_RUNNING = 3,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_ENDED = 4,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_WAITING_TO_START = 5,
+  EMBER_ZCL_POWER_PROFILE_STATE_ENERGY_PHASE_STARTED = 6,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_ENDED = 7,
+  EMBER_ZCL_POWER_PROFILE_STATE_PROFILE_READY_FOR_SCHEDULING = 8,
+  EMBER_ZCL_POWER_PROFILE_STATE_POWER_PROFILE_SCHEDULED = 9,
 } EmberAfPowerProfileState;
 
 // Enum for PowerSource
-typedef enum
-{
-    EMBER_ZCL_POWER_SOURCE_UNKNOWN                         = 0,
-    EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS              = 1,
-    EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS               = 2,
-    EMBER_ZCL_POWER_SOURCE_BATTERY                         = 3,
-    EMBER_ZCL_POWER_SOURCE_DC_SOURCE                       = 4,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER  = 5,
-    EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
-    EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP                  = 128,
+typedef enum {
+  EMBER_ZCL_POWER_SOURCE_UNKNOWN = 0,
+  EMBER_ZCL_POWER_SOURCE_SINGLE_PHASE_MAINS = 1,
+  EMBER_ZCL_POWER_SOURCE_THREE_PHASE_MAINS = 2,
+  EMBER_ZCL_POWER_SOURCE_BATTERY = 3,
+  EMBER_ZCL_POWER_SOURCE_DC_SOURCE = 4,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_CONSTANT_POWER = 5,
+  EMBER_ZCL_POWER_SOURCE_EMERGENCY_MAINS_TRANSFER_SWITCH = 6,
+  EMBER_ZCL_POWER_SOURCE_BATTERY_BACKUP = 128,
 } EmberAfPowerSource;
 
 // Enum for PrePayGenericAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT                 = 0,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT                  = 1,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED           = 2,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED   = 3,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING     = 5,
-    EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED          = 6,
+typedef enum {
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_LOW_CREDIT = 0,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_NO_CREDIT = 1,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_CREDIT_EXHAUSTED = 2,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_ENABLED = 3,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EMERGENCY_CREDIT_EXHAUSTED = 4,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_IHD_LOW_CREDIT_WARNING = 5,
+  EMBER_ZCL_PRE_PAY_GENERIC_ALARM_GROUP_EVENT_LOG_CLEARED = 6,
 } EmberAfPrePayGenericAlarmGroup;
 
 // Enum for PrepayEventAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER   = 32,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED                      = 34,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT                     = 35,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL                = 36,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT                       = 37,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL                  = 38,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE                           = 39,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR                      = 40,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED                    = 41,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID                    = 42,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE                = 43,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING    = 44,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END            = 45,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR                       = 48,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR                       = 49,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND              = 50,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY                   = 65,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT                   = 66,
-    EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT                          = 67,
+typedef enum {
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PHYSICAL_ATTACK_ON_THE_PREPAY_METER = 32,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ELECTRONIC_ATTACK_ON_THE_PREPAY_METER = 33,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DISCOUNT_APPLIED = 34,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT = 35,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_CREDIT_ADJUSTMENT_FAIL = 36,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT = 37,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_DEBT_ADJUSTMENT_FAIL = 38,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CHANGE = 39,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_ERROR = 40,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_ALREADY_USED = 41,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_TOPUP_CODE_INVALID = 42,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_IN_USE = 43,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END_WARNING = 44,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_FRIENDLY_CREDIT_PERIOD_END = 45,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ERROR_REG_CLEAR = 48,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_ALARM_REG_CLEAR = 49,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_PREPAY_CLUSTER_NOT_FOUND = 50,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_CREDIT2_PREPAY = 65,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_PREPAY2_CREDIT = 66,
+  EMBER_ZCL_PREPAY_EVENT_ALARM_GROUP_MODE_DEFAULT = 67,
 } EmberAfPrepayEventAlarmGroup;
 
 // Enum for PrepaySnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
-    EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED           = 255,
+typedef enum {
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_DEBT_CREDIT_STATUS = 0,
+  EMBER_ZCL_PREPAY_SNAPSHOT_PAYLOAD_TYPE_NOT_USED = 255,
 } EmberAfPrepaySnapshotPayloadType;
 
 // Enum for PrepaySwitchAlarmGroup
-typedef enum
-{
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON                           = 16,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM                          = 17,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF                          = 18,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE               = 19,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE   = 21,
-    EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED                 = 22,
+typedef enum {
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ON = 16,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_ARM = 17,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_SUPPLY_OFF = 18,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTION_FAILURE = 19,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_TAMPER_DETECTED = 20,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_DISCONNECTED_DUE_TO_CUT_OFF_VALUE = 21,
+  EMBER_ZCL_PREPAY_SWITCH_ALARM_GROUP_REMOTE_DISCONNECTED = 22,
 } EmberAfPrepaySwitchAlarmGroup;
 
 // Enum for PriceControlAcknowledgement
-typedef enum
-{
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
-    EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED     = 1,
+typedef enum {
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_NOT_REQUIRED = 0,
+  EMBER_ZCL_PRICE_CONTROL_ACKNOWLEDGEMENT_REQUIRED = 1,
 } EmberAfPriceControlAcknowledgement;
 
 // Enum for PriceTier
-typedef enum
-{
-    EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED                    = 0,
-    EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL                  = 1,
-    EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL                  = 2,
-    EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL                  = 3,
-    EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL                  = 4,
-    EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL                  = 5,
-    EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL                  = 6,
-    EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL                  = 7,
-    EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL                  = 8,
-    EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL                  = 9,
-    EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL                 = 10,
-    EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL                 = 11,
-    EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL                 = 12,
-    EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL                 = 13,
-    EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL                 = 14,
-    EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
-    EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL                 = 15,
+typedef enum {
+  EMBER_ZCL_PRICE_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_PRICE_TIER_TIER1_PRICE_LABEL = 1,
+  EMBER_ZCL_PRICE_TIER_TIER2_PRICE_LABEL = 2,
+  EMBER_ZCL_PRICE_TIER_TIER3_PRICE_LABEL = 3,
+  EMBER_ZCL_PRICE_TIER_TIER4_PRICE_LABEL = 4,
+  EMBER_ZCL_PRICE_TIER_TIER5_PRICE_LABEL = 5,
+  EMBER_ZCL_PRICE_TIER_TIER6_PRICE_LABEL = 6,
+  EMBER_ZCL_PRICE_TIER_TIER7_PRICE_LABEL = 7,
+  EMBER_ZCL_PRICE_TIER_TIER8_PRICE_LABEL = 8,
+  EMBER_ZCL_PRICE_TIER_TIER9_PRICE_LABEL = 9,
+  EMBER_ZCL_PRICE_TIER_TIER10_PRICE_LABEL = 10,
+  EMBER_ZCL_PRICE_TIER_TIER11_PRICE_LABEL = 11,
+  EMBER_ZCL_PRICE_TIER_TIER12_PRICE_LABEL = 12,
+  EMBER_ZCL_PRICE_TIER_TIER13_PRICE_LABEL = 13,
+  EMBER_ZCL_PRICE_TIER_TIER14_PRICE_LABEL = 14,
+  EMBER_ZCL_PRICE_TIER_REFER_TO_EXTENDED_PRICE_TIER_FIELD = 15,
+  EMBER_ZCL_PRICE_TIER_TIER15_PRICE_LABEL = 15,
 } EmberAfPriceTier;
 
 // Enum for ProductCode
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED        = 0,
-    EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
-    EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER    = 2,
-    EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE      = 3,
-    EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT          = 4,
+typedef enum {
+  EMBER_ZCL_PRODUCT_CODE_MANUFACTURER_DEFINED = 0,
+  EMBER_ZCL_PRODUCT_CODE_ITERNATIONAL_ARTICLE_NUMBER = 1,
+  EMBER_ZCL_PRODUCT_CODE_GLOBAL_TRADE_ITEM_NUMBER = 2,
+  EMBER_ZCL_PRODUCT_CODE_UNIVERSAL_PRODUCT_CODE = 3,
+  EMBER_ZCL_PRODUCT_CODE_STOCK_KEEPING_UNIT = 4,
 } EmberAfProductCode;
 
 // Enum for ProductTypeId
-typedef enum
-{
-    EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS          = 0,
-    EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER           = 22017,
-    EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER         = 22018,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER         = 22019,
-    EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE      = 22020,
-    EMBER_ZCL_PRODUCT_TYPE_ID_HOBS                 = 24067,
-    EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS       = 24073,
-    EMBER_ZCL_PRODUCT_TYPE_ID_OVEN                 = 24065,
-    EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN      = 24070,
-    EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
+typedef enum {
+  EMBER_ZCL_PRODUCT_TYPE_ID_WHITE_GOODS = 0,
+  EMBER_ZCL_PRODUCT_TYPE_ID_DISHWASHER = 22017,
+  EMBER_ZCL_PRODUCT_TYPE_ID_TUMBLE_DRYER = 22018,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHER_DRYER = 22019,
+  EMBER_ZCL_PRODUCT_TYPE_ID_WASHING_MACHINE = 22020,
+  EMBER_ZCL_PRODUCT_TYPE_ID_HOBS = 24067,
+  EMBER_ZCL_PRODUCT_TYPE_ID_INDUCTION_HOBS = 24073,
+  EMBER_ZCL_PRODUCT_TYPE_ID_OVEN = 24065,
+  EMBER_ZCL_PRODUCT_TYPE_ID_ELECTRICAL_OVEN = 24070,
+  EMBER_ZCL_PRODUCT_TYPE_ID_REFRIGERATOR_FREEZER = 26113,
 } EmberAfProductTypeId;
 
 // Enum for ProposedSupplyStatus
-typedef enum
-{
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED         = 0,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON        = 2,
+typedef enum {
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_RESERVED = 0,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_PROPOSED_SUPPLY_STATUS_SUPPLY_ON = 2,
 } EmberAfProposedSupplyStatus;
 
 // Enum for PublishCppEventCppAuth
-typedef enum
-{
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING  = 0,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
-    EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED   = 3,
+typedef enum {
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_PENDING = 0,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_ACCEPTED = 1,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_REJECTED = 2,
+  EMBER_ZCL_PUBLISH_CPP_EVENT_CPP_AUTH_FORCED = 3,
 } EmberAfPublishCppEventCppAuth;
 
 // Enum for PumpControlMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED        = 0,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE     = 1,
-    EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW         = 3,
-    EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE  = 5,
-    EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC             = 7,
+typedef enum {
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_SPEED = 0,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_PRESSURE = 1,
+  EMBER_ZCL_PUMP_CONTROL_MODE_PROPORTIONAL_PRESSURE = 2,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_FLOW = 3,
+  EMBER_ZCL_PUMP_CONTROL_MODE_CONSTANT_TEMPERATURE = 5,
+  EMBER_ZCL_PUMP_CONTROL_MODE_AUTOMATIC = 7,
 } EmberAfPumpControlMode;
 
 // Enum for PumpOperationMode
-typedef enum
-{
-    EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL  = 0,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
-    EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
-    EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL   = 3,
+typedef enum {
+  EMBER_ZCL_PUMP_OPERATION_MODE_NORMAL = 0,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MINIMUM = 1,
+  EMBER_ZCL_PUMP_OPERATION_MODE_MAXIMUM = 2,
+  EMBER_ZCL_PUMP_OPERATION_MODE_LOCAL = 3,
 } EmberAfPumpOperationMode;
 
 // Enum for PushHistoricalMeteringData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY   = 64,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK  = 128,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
-    EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR  = 448,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_DAY = 64,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_WEEK = 128,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_MONTH = 384,
+  EMBER_ZCL_PUSH_HISTORICAL_METERING_DATA_YEAR = 448,
 } EmberAfPushHistoricalMeteringData;
 
 // Enum for PushHistoricalPaymentData
-typedef enum
-{
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY   = 512,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK  = 1024,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
-    EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR  = 3584,
+typedef enum {
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_DAY = 512,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_WEEK = 1024,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_MONTH = 3072,
+  EMBER_ZCL_PUSH_HISTORICAL_PAYMENT_DATA_YEAR = 3584,
 } EmberAfPushHistoricalPaymentData;
 
 // Enum for RegisterTier
-typedef enum
-{
-    EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED                              = 0,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE  = 1,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE  = 2,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE  = 3,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE  = 4,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE  = 5,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE  = 6,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE  = 7,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE  = 8,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE  = 9,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
-    EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD        = 15,
-    EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
+typedef enum {
+  EMBER_ZCL_REGISTER_TIER_NO_TIER_RELATED = 0,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER1_SUMMATION_DELIVERED_ATTRIBUTE = 1,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER2_SUMMATION_DELIVERED_ATTRIBUTE = 2,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER3_SUMMATION_DELIVERED_ATTRIBUTE = 3,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER4_SUMMATION_DELIVERED_ATTRIBUTE = 4,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER5_SUMMATION_DELIVERED_ATTRIBUTE = 5,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER6_SUMMATION_DELIVERED_ATTRIBUTE = 6,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER7_SUMMATION_DELIVERED_ATTRIBUTE = 7,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER8_SUMMATION_DELIVERED_ATTRIBUTE = 8,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER9_SUMMATION_DELIVERED_ATTRIBUTE = 9,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER10_SUMMATION_DELIVERED_ATTRIBUTE = 10,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER11_SUMMATION_DELIVERED_ATTRIBUTE = 11,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER12_SUMMATION_DELIVERED_ATTRIBUTE = 12,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER13_SUMMATION_DELIVERED_ATTRIBUTE = 13,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER14_SUMMATION_DELIVERED_ATTRIBUTE = 14,
+  EMBER_ZCL_REGISTER_TIER_REFER_TO_EXTENDED_REGISTER_TIER_FIELD = 15,
+  EMBER_ZCL_REGISTER_TIER_CURRENT_TIER15_SUMMATION_DELIVERED_ATTRIBUTE = 15,
 } EmberAfRegisterTier;
 
 // Enum for RegulatoryLocationType
-typedef enum
-{
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR         = 0,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR        = 1,
-    EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
+typedef enum {
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR = 0,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_OUTDOOR = 1,
+  EMBER_ZCL_REGULATORY_LOCATION_TYPE_INDOOR_OUTDOOR = 2,
 } EmberAfRegulatoryLocationType;
 
 // Enum for RelativeHumidityDisplay
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED     = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_NOT_DISPLAYED = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_DISPLAY_DISPLAYED = 1,
 } EmberAfRelativeHumidityDisplay;
 
 // Enum for RelativeHumidityMode
-typedef enum
-{
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY          = 0,
-    EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
+typedef enum {
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_MEASURE_LOCALLY = 0,
+  EMBER_ZCL_RELATIVE_HUMIDITY_MODE_UPDATED_OVER_THE_NETWORK = 1,
 } EmberAfRelativeHumidityMode;
 
 // Enum for RemoteEnableFlags
-typedef enum
-{
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED                          = 0,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED       = 7,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL            = 15,
-    EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
+typedef enum {
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_DISABLED = 0,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_TEMPORARILY_LOCKED_DISABLED = 7,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_CONTROL = 15,
+  EMBER_ZCL_REMOTE_ENABLE_FLAGS_ENABLED_REMOTE_AND_ENERGY_CONTROL = 1,
 } EmberAfRemoteEnableFlags;
 
 // Enum for RepaymentDebtType
-typedef enum
-{
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1     = 0,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2     = 1,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3     = 2,
-    EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
+typedef enum {
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT1 = 0,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT2 = 1,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_DEBT3 = 2,
+  EMBER_ZCL_REPAYMENT_DEBT_TYPE_ALL_DEBTS = 255,
 } EmberAfRepaymentDebtType;
 
 // Enum for ResultType
-typedef enum
-{
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED                        = 0,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP         = 1,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP       = 2,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR                  = 3,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED     = 4,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK            = 5,
-    EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED         = 16,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED        = 17,
-    EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED           = 18,
+typedef enum {
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED = 0,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_INVALID_TOP_UP = 1,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_DUPLICATE_TOP_UP = 2,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_ERROR = 3,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_MAX_CREDIT_REACHED = 4,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_KEYPAD_LOCK = 5,
+  EMBER_ZCL_RESULT_TYPE_REJECTED_TOP_UP_VALUE_TOO_LARGE = 6,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ENABLED = 16,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_DISABLED = 17,
+  EMBER_ZCL_RESULT_TYPE_ACCEPTED_SUPPLY_ARMED = 18,
 } EmberAfResultType;
 
 // Enum for SampleType
-typedef enum
-{
-    EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
+typedef enum {
+  EMBER_ZCL_SAMPLE_TYPE_CONSUMPTION_DELIVERED = 0,
 } EmberAfSampleType;
 
 // Enum for SaturationMoveMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
-    EMBER_ZCL_SATURATION_MOVE_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_MOVE_MODE_STOP = 0,
+  EMBER_ZCL_SATURATION_MOVE_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_MOVE_MODE_DOWN = 3,
 } EmberAfSaturationMoveMode;
 
 // Enum for SaturationStepMode
-typedef enum
-{
-    EMBER_ZCL_SATURATION_STEP_MODE_UP   = 1,
-    EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
+typedef enum {
+  EMBER_ZCL_SATURATION_STEP_MODE_UP = 1,
+  EMBER_ZCL_SATURATION_STEP_MODE_DOWN = 3,
 } EmberAfSaturationStepMode;
 
 // Enum for SensingLightSensorType
-typedef enum
-{
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
-    EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS       = 1,
+typedef enum {
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_PHOTODIODE = 0,
+  EMBER_ZCL_SENSING_LIGHT_SENSOR_TYPE_CMOS = 1,
 } EmberAfSensingLightSensorType;
 
 // Enum for SetpointAdjustMode
-typedef enum
-{
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT           = 0,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT           = 1,
-    EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
+typedef enum {
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_SETPOINT = 0,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_COOL_SETPOINT = 1,
+  EMBER_ZCL_SETPOINT_ADJUST_MODE_HEAT_AND_COOL_SETPOINTS = 2,
 } EmberAfSetpointAdjustMode;
 
 // Enum for SignatureType
-typedef enum
-{
-    EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
-    EMBER_ZCL_SIGNATURE_TYPE_ECDSA    = 1,
+typedef enum {
+  EMBER_ZCL_SIGNATURE_TYPE_RESERVED = 0,
+  EMBER_ZCL_SIGNATURE_TYPE_ECDSA = 1,
 } EmberAfSignatureType;
 
 // Enum for SnapshotConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED                     = 0,
-    EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 1,
 } EmberAfSnapshotConfirmation;
 
 // Enum for SnapshotPayloadType
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS            = 0,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS             = 1,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED               = 2,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED                = 3,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS  = 5,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING    = 6,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING     = 7,
-    EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE                                   = 128,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS = 0,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTERS = 1,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED = 2,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED = 3,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_DELIVERED_REGISTERS_NO_BILLING = 4,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_TOU_INFORMATION_SET_RECEIVED_REGISTER_NO_BILLINGS = 5,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_DELIVERED_NO_BILLING = 6,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_BLOCK_TIER_INFORMATION_SET_RECEIVED_NO_BILLING = 7,
+  EMBER_ZCL_SNAPSHOT_PAYLOAD_TYPE_DATA_UNAVAILABLE = 128,
 } EmberAfSnapshotPayloadType;
 
 // Enum for SnapshotScheduleConfirmation
-typedef enum
-{
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED                                   = 0,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED                = 1,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED               = 2,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE  = 3,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
-    EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE   = 5,
+typedef enum {
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_ACCEPTED = 0,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_TYPE_NOT_SUPPORTED = 1,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_CAUSE_NOT_SUPPORTED = 2,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULE_NOT_CURRENTLY_AVAILABLE = 3,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_SNAPSHOT_SCHEDULES_NOT_SUPPORTED_BY_DEVICE = 4,
+  EMBER_ZCL_SNAPSHOT_SCHEDULE_CONFIRMATION_INSUFFICIENT_SPACE_FOR_SNAPSHOT_SCHEDULE = 5,
 } EmberAfSnapshotScheduleConfirmation;
 
 // Enum for SquawkLevel
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL       = 0,
-    EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL    = 1,
-    EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL      = 2,
-    EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
+typedef enum {
+  EMBER_ZCL_SQUAWK_LEVEL_LOW_LEVEL = 0,
+  EMBER_ZCL_SQUAWK_LEVEL_MEDIUM_LEVEL = 1,
+  EMBER_ZCL_SQUAWK_LEVEL_HIGH_LEVEL = 2,
+  EMBER_ZCL_SQUAWK_LEVEL_VERY_HIGH_LEVEL = 2,
 } EmberAfSquawkLevel;
 
 // Enum for SquawkMode
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED    = 0,
-    EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_ARMED = 0,
+  EMBER_ZCL_SQUAWK_MODE_SYSTEM_IS_DISARMED = 1,
 } EmberAfSquawkMode;
 
 // Enum for SquawkStobe
-typedef enum
-{
-    EMBER_ZCL_SQUAWK_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_SQUAWK_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_SQUAWK_STOBE_USE_STROBE = 1,
 } EmberAfSquawkStobe;
 
 // Enum for StartOfWeek
-typedef enum
-{
-    EMBER_ZCL_START_OF_WEEK_SUNDAY    = 0,
-    EMBER_ZCL_START_OF_WEEK_MONDAY    = 1,
-    EMBER_ZCL_START_OF_WEEK_TUESDAY   = 2,
-    EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
-    EMBER_ZCL_START_OF_WEEK_THURSDAY  = 4,
-    EMBER_ZCL_START_OF_WEEK_FRIDAY    = 5,
-    EMBER_ZCL_START_OF_WEEK_SATURDAY  = 6,
+typedef enum {
+  EMBER_ZCL_START_OF_WEEK_SUNDAY = 0,
+  EMBER_ZCL_START_OF_WEEK_MONDAY = 1,
+  EMBER_ZCL_START_OF_WEEK_TUESDAY = 2,
+  EMBER_ZCL_START_OF_WEEK_WEDNESDAY = 3,
+  EMBER_ZCL_START_OF_WEEK_THURSDAY = 4,
+  EMBER_ZCL_START_OF_WEEK_FRIDAY = 5,
+  EMBER_ZCL_START_OF_WEEK_SATURDAY = 6,
 } EmberAfStartOfWeek;
 
 // Enum for StartUpOnOffValue
-typedef enum
-{
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF      = 0,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON       = 1,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE   = 2,
-    EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
+typedef enum {
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_OFF = 0,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_ON = 1,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_TOGGLE = 2,
+  EMBER_ZCL_START_UP_ON_OFF_VALUE_SET_TO_PREVIOUS = 255,
 } EmberAfStartUpOnOffValue;
 
 // Enum for StepMode
-typedef enum
-{
-    EMBER_ZCL_STEP_MODE_UP   = 0,
-    EMBER_ZCL_STEP_MODE_DOWN = 1,
+typedef enum {
+  EMBER_ZCL_STEP_MODE_UP = 0,
+  EMBER_ZCL_STEP_MODE_DOWN = 1,
 } EmberAfStepMode;
 
 // Enum for SupplyStatus
-typedef enum
-{
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF       = 0,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON        = 2,
-    EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
+typedef enum {
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF = 0,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_OFF_ARMED = 1,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_ON = 2,
+  EMBER_ZCL_SUPPLY_STATUS_SUPPLY_UNCHANGED = 3,
 } EmberAfSupplyStatus;
 
 // Enum for SwitchActions
-typedef enum
-{
-    EMBER_ZCL_SWITCH_ACTIONS_ON     = 0,
-    EMBER_ZCL_SWITCH_ACTIONS_OFF    = 1,
-    EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_ACTIONS_ON = 0,
+  EMBER_ZCL_SWITCH_ACTIONS_OFF = 1,
+  EMBER_ZCL_SWITCH_ACTIONS_TOGGLE = 2,
 } EmberAfSwitchActions;
 
 // Enum for SwitchType
-typedef enum
-{
-    EMBER_ZCL_SWITCH_TYPE_TOGGLE         = 0,
-    EMBER_ZCL_SWITCH_TYPE_MOMENTARY      = 1,
-    EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
+typedef enum {
+  EMBER_ZCL_SWITCH_TYPE_TOGGLE = 0,
+  EMBER_ZCL_SWITCH_TYPE_MOMENTARY = 1,
+  EMBER_ZCL_SWITCH_TYPE_MULTI_FUNCTION = 2,
 } EmberAfSwitchType;
 
 // Enum for TariffChargingScheme
-typedef enum
-{
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF                                           = 0,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF                                         = 16,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS              = 32,
-    EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
+typedef enum {
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_TOU_TARIFF = 0,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TARIFF = 16,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_COMMON_THRESHOLDS = 32,
+  EMBER_ZCL_TARIFF_CHARGING_SCHEME_BLOCK_TOU_TARIFF_WITH_INDIVIDUAL_THRESHOLDS_PER_TIER = 48,
 } EmberAfTariffChargingScheme;
 
 // Enum for TariffResolutionPeriod
-typedef enum
-{
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED  = 0,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
-    EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY      = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_NOT_DEFINED = 0,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_BLOCK_PERIOD = 1,
+  EMBER_ZCL_TARIFF_RESOLUTION_PERIOD_ONE_DAY = 2,
 } EmberAfTariffResolutionPeriod;
 
 // Enum for TariffType
-typedef enum
-{
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF              = 0,
-    EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF               = 1,
-    EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
+typedef enum {
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_TARIFF = 0,
+  EMBER_ZCL_TARIFF_TYPE_RECEIVED_TARIFF = 1,
+  EMBER_ZCL_TARIFF_TYPE_DELIVERED_AND_RECEIVED_TARIFF = 2,
 } EmberAfTariffType;
 
 // Enum for TemperatureDisplayMode
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS    = 0,
-    EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_CELSIUS = 0,
+  EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1,
 } EmberAfTemperatureDisplayMode;
 
 // Enum for TemperatureSetpointHold
-typedef enum
-{
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
-    EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON  = 1,
+typedef enum {
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_OFF = 0,
+  EMBER_ZCL_TEMPERATURE_SETPOINT_HOLD_SETPOINT_HOLD_ON = 1,
 } EmberAfTemperatureSetpointHold;
 
 // Enum for ThermostatControlSequence
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY                    = 0,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT             = 1,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY                    = 2,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT             = 3,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING             = 4,
-    EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_ONLY = 0,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_WITH_REHEAT = 1,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_ONLY = 2,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_HEATING_WITH_REHEAT = 3,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING = 4,
+  EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT = 5,
 } EmberAfThermostatControlSequence;
 
 // Enum for ThermostatRunningMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF  = 0,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
-    EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_RUNNING_MODE_HEAT = 4,
 } EmberAfThermostatRunningMode;
 
 // Enum for ThermostatSystemMode
-typedef enum
-{
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF               = 0,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO              = 1,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL              = 3,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT              = 4,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING        = 6,
-    EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY          = 7,
+typedef enum {
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_OFF = 0,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_AUTO = 1,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_COOL = 3,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_HEAT = 4,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_EMERGENCY_HEATING = 5,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_PRECOOLING = 6,
+  EMBER_ZCL_THERMOSTAT_SYSTEM_MODE_FAN_ONLY = 7,
 } EmberAfThermostatSystemMode;
 
 // Enum for TierBlockMode
-typedef enum
-{
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK                      = 0,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER           = 1,
-    EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
-    EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED                          = 255,
+typedef enum {
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK = 0,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER = 1,
+  EMBER_ZCL_TIER_BLOCK_MODE_ACTIVE_BLOCK_PRICE_TIER_THRESHOLD = 2,
+  EMBER_ZCL_TIER_BLOCK_MODE_NOT_USED = 255,
 } EmberAfTierBlockMode;
 
 // Enum for TimeEncoding
-typedef enum
-{
-    EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
-    EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
+typedef enum {
+  EMBER_ZCL_TIME_ENCODING_RELATIVE = 0,
+  EMBER_ZCL_TIME_ENCODING_ABSOLUTE = 64,
 } EmberAfTimeEncoding;
 
 // Enum for TunnelingProtocolId
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM   = 0,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107    = 1,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12     = 2,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS        = 3,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML          = 4,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP      = 6,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4        = 7,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6        = 8,
-    EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST         = 199,
+typedef enum {
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_DLMS_COSEM = 0,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IEC_61107 = 1,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_ANSI_C12 = 2,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_M_BUS = 3,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_SML = 4,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_CLIMATE_TALK = 5,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_GB_HRGP = 6,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V4 = 7,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_IP_V6 = 8,
+  EMBER_ZCL_TUNNELING_PROTOCOL_ID_TEST = 199,
 } EmberAfTunnelingProtocolId;
 
 // Enum for TunnelingTransferDataStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE   = 1,
-    EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW  = 2,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_NO_SUCH_TUNNEL = 0,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_WRONG_DEVICE = 1,
+  EMBER_ZCL_TUNNELING_TRANSFER_DATA_STATUS_DATA_OVERFLOW = 2,
 } EmberAfTunnelingTransferDataStatus;
 
 // Enum for TunnelingTunnelStatus
-typedef enum
-{
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS                    = 0,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY                       = 1,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS         = 2,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED     = 3,
-    EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
+typedef enum {
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_BUSY = 1,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_NO_MORE_TUNNEL_IDS = 2,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_PROTOCOL_NOT_SUPPORTED = 3,
+  EMBER_ZCL_TUNNELING_TUNNEL_STATUS_FLOW_CONTROL_NOT_SUPPORTED = 4,
 } EmberAfTunnelingTunnelStatus;
 
 // Enum for TvChannelErrorType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
-    EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES       = 1,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_MULTIPLE_MATCHES = 0,
+  EMBER_ZCL_TV_CHANNEL_ERROR_TYPE_NO_MATCHES = 1,
 } EmberAfTvChannelErrorType;
 
 // Enum for TvChannelLineupInfoType
-typedef enum
-{
-    EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
+typedef enum {
+  EMBER_ZCL_TV_CHANNEL_LINEUP_INFO_TYPE_MSO = 0,
 } EmberAfTvChannelLineupInfoType;
 
 // Enum for WanStatus
-typedef enum
-{
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
-    EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE     = 1,
+typedef enum {
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_NOT_AVAILABLE = 0,
+  EMBER_ZCL_WAN_STATUS_CONNECTION_TO_WAN_IS_AVAILABLE = 1,
 } EmberAfWanStatus;
 
 // Enum for WarningEvent
-typedef enum
-{
-    EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL                                             = 0,
-    EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL                                             = 1,
-    EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL                                    = 2,
-    EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL                                    = 3,
-    EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
+typedef enum {
+  EMBER_ZCL_WARNING_EVENT_WARNING1_OVERALL_POWER_ABOVE_AVAILABLE_POWER_LEVEL = 0,
+  EMBER_ZCL_WARNING_EVENT_WARNING2_OVERALL_POWER_ABOVE_POWER_THRESHOLD_LEVEL = 1,
+  EMBER_ZCL_WARNING_EVENT_WARNING3_OVERALL_POWER_BACK_BELOW_THE_AVAILABLE_POWER_LEVEL = 2,
+  EMBER_ZCL_WARNING_EVENT_WARNING4_OVERALL_POWER_BACK_BELOW_THE_POWER_THRESHOLD_LEVEL = 3,
+  EMBER_ZCL_WARNING_EVENT_WARNING5_OVERALL_POWER_WILL_BE_POTENTIALLY_ABOVE_AVAILABLE_POWER_LEVEL_IF_THE_APPLIANCE_STARTS = 4,
 } EmberAfWarningEvent;
 
 // Enum for WarningMode
-typedef enum
-{
-    EMBER_ZCL_WARNING_MODE_STOP            = 0,
-    EMBER_ZCL_WARNING_MODE_BURGLAR         = 1,
-    EMBER_ZCL_WARNING_MODE_FIRE            = 2,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY       = 3,
-    EMBER_ZCL_WARNING_MODE_POLICE_PANIC    = 4,
-    EMBER_ZCL_WARNING_MODE_FIRE_PANIC      = 5,
-    EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
+typedef enum {
+  EMBER_ZCL_WARNING_MODE_STOP = 0,
+  EMBER_ZCL_WARNING_MODE_BURGLAR = 1,
+  EMBER_ZCL_WARNING_MODE_FIRE = 2,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY = 3,
+  EMBER_ZCL_WARNING_MODE_POLICE_PANIC = 4,
+  EMBER_ZCL_WARNING_MODE_FIRE_PANIC = 5,
+  EMBER_ZCL_WARNING_MODE_EMERGENCY_PANIC = 6,
 } EmberAfWarningMode;
 
 // Enum for WarningStobe
-typedef enum
-{
-    EMBER_ZCL_WARNING_STOBE_NO_STROBE  = 0,
-    EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
+typedef enum {
+  EMBER_ZCL_WARNING_STOBE_NO_STROBE = 0,
+  EMBER_ZCL_WARNING_STOBE_USE_STROBE = 1,
 } EmberAfWarningStobe;
 
 // Enum for WwahIasZoneEnrollmentMode
-typedef enum
-{
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR             = 0,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
-    EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST                  = 2,
+typedef enum {
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_TRIP_TO_PAIR = 0,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_AUTO_ENROLLMENT_RESPONSE = 1,
+  EMBER_ZCL_WWAH_IAS_ZONE_ENROLLMENT_MODE_REQUEST = 2,
 } EmberAfWwahIasZoneEnrollmentMode;
 
 // Enum for WwahPowerNotificationReason
-typedef enum
-{
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN               = 0,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY               = 1,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT              = 2,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG              = 3,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN             = 4,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION     = 6,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS  = 7,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET        = 8,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON          = 9,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE           = 10,
-    EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE      = 11,
+typedef enum {
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_UNKNOWN = 0,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BATTERY = 1,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BROWNOUT = 2,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_WATCHDOG = 3,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_RESET_PIN = 4,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_MEMORY_HARDWARE_FAULT = 5,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFWARE_EXCEPTION = 6,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_OTA_BOOTLOAD_SUCCESS = 7,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_SOFTWARE_RESET = 8,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_POWER_BUTTON = 9,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_TEMPERATURE = 10,
+  EMBER_ZCL_WWAH_POWER_NOTIFICATION_REASON_BOOTLOAD_FAILURE = 11,
 } EmberAfWwahPowerNotificationReason;
 
 // Enum for ZigbeeInformationLogicalType
-typedef enum
-{
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER      = 1,
-    EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE  = 2,
+typedef enum {
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_COORDINATOR = 0,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_ROUTER = 1,
+  EMBER_ZCL_ZIGBEE_INFORMATION_LOGICAL_TYPE_END_DEVICE = 2,
 } EmberAfZigbeeInformationLogicalType;
 
 // Enum for ZllStatus
-typedef enum
-{
-    EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
-    EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
+typedef enum {
+  EMBER_ZCL_ZLL_STATUS_SUCCESS = 0,
+  EMBER_ZCL_ZLL_STATUS_FAILURE = 1,
 } EmberAfZllStatus;
 
 #define EMBER_AF_ALARM_MASK_GENERAL_HW_FAULT (1)
@@ -3759,10 +3541,8 @@ typedef enum
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_REMOTE_LOAD_CONTROL_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND (4294967296)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_BY_OTHER_REMOTE_COMMAND_OFFSET (32)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT      \
-    (5368709120)
-#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET \
-    (30)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT (5368709120)
+#define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_SHORT_CIRCUIT_OFFSET (30)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER (6442450944)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_SERVICE_DISCONNECTION_REASON_OFF_DUE_TO_OVERHEATING_OTHER_OFFSET (31)
 #define EMBER_AF_METERING_EXTENDED_STATUS_ELECTRICITY_METER_BI_DIRECTIONAL_OPERATION (17179869184)
diff --git a/src/darwin/Framework/CHIP/gen/gen_config.h b/src/darwin/Framework/CHIP/gen/gen_config.h
index a61e278bdebe97..822b34addf02cd 100644
--- a/src/darwin/Framework/CHIP/gen/gen_config.h
+++ b/src/darwin/Framework/CHIP/gen/gen_config.h
@@ -26,6 +26,7 @@
 /**** Network Section ****/
 #define EMBER_SUPPORTED_NETWORKS (1)
 
+
 #define EMBER_APS_UNICAST_MESSAGE_COUNT 10
 
 /**** Cluster endpoint counts ****/
diff --git a/src/darwin/Framework/CHIP/gen/print-cluster.h b/src/darwin/Framework/CHIP/gen/print-cluster.h
index dd27c7093aa488..8b286c09764b0f 100644
--- a/src/darwin/Framework/CHIP/gen/print-cluster.h
+++ b/src/darwin/Framework/CHIP/gen/print-cluster.h
@@ -25,956 +25,888 @@
 // The names of clusters that are not present, are removed.
 
 #if defined(ZCL_USING_POWER_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_POWER_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER { ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER {ZCL_POWER_CONFIG_CLUSTER_ID, 1, "Power Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_TEMP_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_TEMP_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER { ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER {ZCL_DEVICE_TEMP_CLUSTER_ID, 2, "Device Temperature Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IDENTIFY_CLUSTER_SERVER) || defined(ZCL_USING_IDENTIFY_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER { ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER {ZCL_IDENTIFY_CLUSTER_ID, 3, "Identify" },
 #else
-#define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
+    #define CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUPS_CLUSTER_SERVER) || defined(ZCL_USING_GROUPS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER { ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER {ZCL_GROUPS_CLUSTER_ID, 4, "Groups" },
 #else
-#define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUPS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SCENES_CLUSTER_SERVER) || defined(ZCL_USING_SCENES_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER { ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER {ZCL_SCENES_CLUSTER_ID, 5, "Scenes" },
 #else
-#define CHIP_PRINTCLUSTER_SCENES_CLUSTER
+    #define CHIP_PRINTCLUSTER_SCENES_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER { ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER {ZCL_ON_OFF_CLUSTER_ID, 6, "On/off" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER {ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, 7, "On/off Switch Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER { ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER {ZCL_LEVEL_CONTROL_CLUSTER_ID, 8, "Level Control" },
 #else
-#define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ALARM_CLUSTER_SERVER) || defined(ZCL_USING_ALARM_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER { ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER {ZCL_ALARM_CLUSTER_ID, 9, "Alarms" },
 #else
-#define CHIP_PRINTCLUSTER_ALARM_CLUSTER
+    #define CHIP_PRINTCLUSTER_ALARM_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TIME_CLUSTER_SERVER) || defined(ZCL_USING_TIME_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER { ZCL_TIME_CLUSTER_ID, 10, "Time" },
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER {ZCL_TIME_CLUSTER_ID, 10, "Time" },
 #else
-#define CHIP_PRINTCLUSTER_TIME_CLUSTER
+    #define CHIP_PRINTCLUSTER_TIME_CLUSTER
 #endif
 
 #if defined(ZCL_USING_RSSI_LOCATION_CLUSTER_SERVER) || defined(ZCL_USING_RSSI_LOCATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER { ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER {ZCL_RSSI_LOCATION_CLUSTER_ID, 11, "RSSI Location" },
 #else
-#define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BINARY_INPUT_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER { ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER {ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, 15, "Binary Input (Basic)" },
 #else
-#define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER { ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER {ZCL_COMMISSIONING_CLUSTER_ID, 21, "Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PARTITION_CLUSTER_SERVER) || defined(ZCL_USING_PARTITION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER { ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER {ZCL_PARTITION_CLUSTER_ID, 22, "Partition" },
 #else
-#define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
+    #define CHIP_PRINTCLUSTER_PARTITION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_SERVER) || defined(ZCL_USING_OTA_BOOTLOAD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER { ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER {ZCL_OTA_BOOTLOAD_CLUSTER_ID, 25, "Over the Air Bootloading" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POWER_PROFILE_CLUSTER_SERVER) || defined(ZCL_USING_POWER_PROFILE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER { ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER {ZCL_POWER_PROFILE_CLUSTER_ID, 26, "Power Profile" },
 #else
-#define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
+    #define CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER { ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER {ZCL_APPLIANCE_CONTROL_CLUSTER_ID, 27, "Appliance Control" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER {ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" },
 #else
-#define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_POLL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_POLL_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER { ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER {ZCL_POLL_CONTROL_CLUSTER_ID, 32, "Poll Control" },
 #else
-#define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GREEN_POWER_CLUSTER_SERVER) || defined(ZCL_USING_GREEN_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER { ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER {ZCL_GREEN_POWER_CLUSTER_ID, 33, "Green Power" },
 #else
-#define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEEPALIVE_CLUSTER_SERVER) || defined(ZCL_USING_KEEPALIVE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER { ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER {ZCL_KEEPALIVE_CLUSTER_ID, 37, "Keep-Alive" },
 #else
-#define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER { ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER {ZCL_BASIC_CLUSTER_ID, 40, "Basic" },
 #else
-#define CHIP_PRINTCLUSTER_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_GENERAL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER { ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER {ZCL_GENERAL_COMMISSIONING_CLUSTER_ID, 48, "General Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_NETWORK_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER { ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER {ZCL_NETWORK_COMMISSIONING_CLUSTER_ID, 49, "Network Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SHADE_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_SHADE_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER { ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER {ZCL_SHADE_CONFIG_CLUSTER_ID, 256, "Shade Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DOOR_LOCK_CLUSTER_SERVER) || defined(ZCL_USING_DOOR_LOCK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER { ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER {ZCL_DOOR_LOCK_CLUSTER_ID, 257, "Door Lock" },
 #else
-#define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
+    #define CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WINDOW_COVERING_CLUSTER_SERVER) || defined(ZCL_USING_WINDOW_COVERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER { ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER {ZCL_WINDOW_COVERING_CLUSTER_ID, 258, "Window Covering" },
 #else
-#define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_BARRIER_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER { ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER {ZCL_BARRIER_CONTROL_CLUSTER_ID, 259, "Barrier Control" },
 #else
-#define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER {ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, 512, "Pump Configuration and Control" },
 #else
-#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER { ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER {ZCL_THERMOSTAT_CLUSTER_ID, 513, "Thermostat" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FAN_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_FAN_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER { ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER {ZCL_FAN_CONTROL_CLUSTER_ID, 514, "Fan Control" },
 #else
-#define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEHUMID_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER { ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER {ZCL_DEHUMID_CONTROL_CLUSTER_ID, 515, "Dehumidification Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                             \
-    { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER {ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, 516, "Thermostat User Interface Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
+    #define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER
 #endif
 
 #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER { ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER {ZCL_COLOR_CONTROL_CLUSTER_ID, 768, "Color Control" },
 #else
-#define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_BALLAST_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER { ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER {ZCL_BALLAST_CONFIGURATION_CLUSTER_ID, 769, "Ballast Configuration" },
 #else
-#define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER { ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER {ZCL_ILLUM_MEASUREMENT_CLUSTER_ID, 1024, "Illuminance Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_ILLUM_LEVEL_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER { ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER {ZCL_ILLUM_LEVEL_SENSING_CLUSTER_ID, 1025, "Illuminance Level Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER {ZCL_TEMP_MEASUREMENT_CLUSTER_ID, 1026, "Temperature Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER { ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER {ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID, 1027, "Pressure Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLOW_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER { ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER {ZCL_FLOW_MEASUREMENT_CLUSTER_ID, 1028, "Flow Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) ||                                                             \
-    defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                    \
-    { ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
+#if defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER {ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID, 1029, "Relative Humidity Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_SERVER) || defined(ZCL_USING_OCCUPANCY_SENSING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER { ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER {ZCL_OCCUPANCY_SENSING_CLUSTER_ID, 1030, "Occupancy Sensing" },
 #else
-#define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
+    #define CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                 \
-    defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                        \
-    { ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1036, "Carbon Monoxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1037, "Carbon Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1038, "Ethylene Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
+#if defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1039, "Ethylene Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1040, "Hydrogen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                               \
-    defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    { ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
+#if defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1041, "Hydrogen Sulphide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                    \
-    defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    { ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
+#if defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1042, "Nitric Oxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1043, "Nitrogen Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1044, "Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                           \
-    defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    { ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
+#if defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1045, "Ozone Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                  \
-    defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                         \
-    { ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
+#if defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1046, "Sulfur Dioxide Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
+#if defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1047, "Dissolved Oxygen Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
+#if defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1048, "Bromate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                     \
-    defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    { ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
+#if defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1049, "Chloramines Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
+#if defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1050, "Chlorine Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                       \
-    defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                              \
-    { ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051,                                                    \
-      "Fecal coliform and E. Coli Concentration Measurement" },
+#if defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1051, "Fecal coliform and E. Coli Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                        \
-    defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    { ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
+#if defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1052, "Fluoride Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                \
-    defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    { ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
+#if defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1053, "Haloacetic Acids Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                           \
-    defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    { ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1054, "Total Trihalomethanes Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                         \
-    defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                \
-    { ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
+#if defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1055, "Total Coliform Bacteria Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
+#if defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1056, "Turbidity Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
+#if defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1057, "Copper Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                            \
-    defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    { ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
+#if defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1058, "Lead Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
+#if defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1059, "Manganese Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                         \
-    defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    { ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
+#if defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1060, "Sulfate Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
+#if defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1061, "Bromodichloromethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                       \
-    defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                              \
-    { ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
+#if defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1062, "Bromoform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                            \
-    defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                   \
-    { ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
+#if defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1063, "Chlorodibromomethane Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                      \
-    defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    { ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
+#if defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1064, "Chloroform Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
-#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) ||                                                          \
-    defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    { ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
+#if defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER {ZCL_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER_ID, 1065, "Sodium Concentration Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ZONE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ZONE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER { ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER {ZCL_IAS_ZONE_CLUSTER_ID, 1280, "IAS Zone" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_ACE_CLUSTER_SERVER) || defined(ZCL_USING_IAS_ACE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER { ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER {ZCL_IAS_ACE_CLUSTER_ID, 1281, "IAS ACE" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_IAS_WD_CLUSTER_SERVER) || defined(ZCL_USING_IAS_WD_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER { ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER {ZCL_IAS_WD_CLUSTER_ID, 1282, "IAS WD" },
 #else
-#define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
+    #define CHIP_PRINTCLUSTER_IAS_WD_CLUSTER
 #endif
 
 #if defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_SERVER) || defined(ZCL_USING_WAKE_ON_LAN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER { ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER {ZCL_WAKE_ON_LAN_CLUSTER_ID, 1283, "Wake on LAN" },
 #else
-#define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
+    #define CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TV_CHANNEL_CLUSTER_SERVER) || defined(ZCL_USING_TV_CHANNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER { ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER {ZCL_TV_CHANNEL_CLUSTER_ID, 1284, "TV Channel" },
 #else
-#define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_SERVER) || defined(ZCL_USING_TARGET_NAVIGATOR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER { ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER {ZCL_TARGET_NAVIGATOR_CLUSTER_ID, 1285, "Target Navigator" },
 #else
-#define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
+    #define CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_PLAYBACK_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER { ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER {ZCL_MEDIA_PLAYBACK_CLUSTER_ID, 1286, "Media Playback" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MEDIA_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_MEDIA_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER { ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER {ZCL_MEDIA_INPUT_CLUSTER_ID, 1287, "Media Input" },
 #else
-#define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_LOW_POWER_CLUSTER_SERVER) || defined(ZCL_USING_LOW_POWER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER { ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER {ZCL_LOW_POWER_CLUSTER_ID, 1288, "Low Power" },
 #else
-#define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
+    #define CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_SERVER) || defined(ZCL_USING_KEYPAD_INPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER { ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER {ZCL_KEYPAD_INPUT_CLUSTER_ID, 1289, "Keypad Input" },
 #else
-#define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER {ZCL_CONTENT_LAUNCH_CLUSTER_ID, 1290, "Content Launch" },
 #else
-#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
+    #define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER
 #endif
 
 #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER { ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER {ZCL_AUDIO_OUTPUT_CLUSTER_ID, 1291, "Audio Output" },
 #else
-#define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
+    #define CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_LAUNCHER_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER { ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER {ZCL_APPLICATION_LAUNCHER_CLUSTER_ID, 1292, "Application Launcher" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_SERVER) || defined(ZCL_USING_APPLICATION_BASIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER { ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER {ZCL_APPLICATION_BASIC_CLUSTER_ID, 1293, "Application Basic" },
 #else
-#define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_SERVER) || defined(ZCL_USING_ACCOUNT_LOGIN_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER { ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER {ZCL_ACCOUNT_LOGIN_CLUSTER_ID, 1294, "Account Login" },
 #else
-#define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
+    #define CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_GENERIC_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER { ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER {ZCL_GENERIC_TUNNEL_CLUSTER_ID, 1536, "Generic Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_BACNET_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER { ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER {ZCL_BACNET_PROTOCOL_TUNNEL_CLUSTER_ID, 1537, "BACnet Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_11073_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER { ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER {ZCL_11073_PROTOCOL_TUNNEL_CLUSTER_ID, 1556, "11073 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_SERVER) || defined(ZCL_USING_ISO7816_PROTOCOL_TUNNEL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                          \
-    { ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER {ZCL_ISO7816_PROTOCOL_TUNNEL_CLUSTER_ID, 1557, "ISO 7816 Protocol Tunnel" },
 #else
-#define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
+    #define CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PRICE_CLUSTER_SERVER) || defined(ZCL_USING_PRICE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER { ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER {ZCL_PRICE_CLUSTER_ID, 1792, "Price" },
 #else
-#define CHIP_PRINTCLUSTER_PRICE_CLUSTER
+    #define CHIP_PRINTCLUSTER_PRICE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                     \
-    { ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER {ZCL_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_ID, 1793, "Demand Response and Load Control" },
 #else
-#define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SIMPLE_METERING_CLUSTER_SERVER) || defined(ZCL_USING_SIMPLE_METERING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER { ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER {ZCL_SIMPLE_METERING_CLUSTER_ID, 1794, "Simple Metering" },
 #else
-#define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
+    #define CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MESSAGING_CLUSTER_SERVER) || defined(ZCL_USING_MESSAGING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER { ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER {ZCL_MESSAGING_CLUSTER_ID, 1795, "Messaging" },
 #else
-#define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MESSAGING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_TUNNELING_CLUSTER_SERVER) || defined(ZCL_USING_TUNNELING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER { ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER {ZCL_TUNNELING_CLUSTER_ID, 1796, "Tunneling" },
 #else
-#define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
+    #define CHIP_PRINTCLUSTER_TUNNELING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PREPAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PREPAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER { ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER {ZCL_PREPAYMENT_CLUSTER_ID, 1797, "Prepayment" },
 #else
-#define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_ENERGY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER { ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER {ZCL_ENERGY_MANAGEMENT_CLUSTER_ID, 1798, "Energy Management" },
 #else
-#define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CALENDAR_CLUSTER_SERVER) || defined(ZCL_USING_CALENDAR_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER { ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER {ZCL_CALENDAR_CLUSTER_ID, 1799, "Calendar" },
 #else
-#define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
+    #define CHIP_PRINTCLUSTER_CALENDAR_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_DEVICE_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER { ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER {ZCL_DEVICE_MANAGEMENT_CLUSTER_ID, 1800, "Device Management" },
 #else
-#define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_EVENTS_CLUSTER_SERVER) || defined(ZCL_USING_EVENTS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER { ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER {ZCL_EVENTS_CLUSTER_ID, 1801, "Events" },
 #else
-#define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
+    #define CHIP_PRINTCLUSTER_EVENTS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MDU_PAIRING_CLUSTER_SERVER) || defined(ZCL_USING_MDU_PAIRING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER { ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER {ZCL_MDU_PAIRING_CLUSTER_ID, 1802, "MDU Pairing" },
 #else
-#define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
+    #define CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SUB_GHZ_CLUSTER_SERVER) || defined(ZCL_USING_SUB_GHZ_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER { ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER {ZCL_SUB_GHZ_CLUSTER_ID, 1803, "Sub-GHz" },
 #else
-#define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
+    #define CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER
 #endif
 
 #if defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_SERVER) || defined(ZCL_USING_KEY_ESTABLISHMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER { ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER {ZCL_KEY_ESTABLISHMENT_CLUSTER_ID, 2048, "Key Establishment" },
 #else
-#define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_INFORMATION_CLUSTER_SERVER) || defined(ZCL_USING_INFORMATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER { ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER {ZCL_INFORMATION_CLUSTER_ID, 2304, "Information" },
 #else
-#define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_INFORMATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_SHARING_CLUSTER_SERVER) || defined(ZCL_USING_DATA_SHARING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER { ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER {ZCL_DATA_SHARING_CLUSTER_ID, 2305, "Data Sharing" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GAMING_CLUSTER_SERVER) || defined(ZCL_USING_GAMING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER { ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER {ZCL_GAMING_CLUSTER_ID, 2306, "Gaming" },
 #else
-#define CHIP_PRINTCLUSTER_GAMING_CLUSTER
+    #define CHIP_PRINTCLUSTER_GAMING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_DATA_RATE_CONTROL_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER { ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER {ZCL_DATA_RATE_CONTROL_CLUSTER_ID, 2307, "Data Rate Control" },
 #else
-#define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
+    #define CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER
 #endif
 
 #if defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_SERVER) || defined(ZCL_USING_VOICE_OVER_ZIGBEE_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER { ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER {ZCL_VOICE_OVER_ZIGBEE_CLUSTER_ID, 2308, "Voice over ZigBee" },
 #else
-#define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
+    #define CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER
 #endif
 
 #if defined(ZCL_USING_CHATTING_CLUSTER_SERVER) || defined(ZCL_USING_CHATTING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER { ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER {ZCL_CHATTING_CLUSTER_ID, 2309, "Chatting" },
 #else
-#define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
+    #define CHIP_PRINTCLUSTER_CHATTING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_PAYMENT_CLUSTER_SERVER) || defined(ZCL_USING_PAYMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER { ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER {ZCL_PAYMENT_CLUSTER_ID, 2561, "Payment" },
 #else
-#define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_PAYMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BILLING_CLUSTER_SERVER) || defined(ZCL_USING_BILLING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER { ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER {ZCL_BILLING_CLUSTER_ID, 2562, "Billing" },
 #else
-#define CHIP_PRINTCLUSTER_BILLING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BILLING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                         \
-    { ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER {ZCL_APPLIANCE_IDENTIFICATION_CLUSTER_ID, 2816, "Appliance Identification" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_SERVER) || defined(ZCL_USING_METER_IDENTIFICATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER { ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER {ZCL_METER_IDENTIFICATION_CLUSTER_ID, 2817, "Meter Identification" },
 #else
-#define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                       \
-    { ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER {ZCL_APPLIANCE_EVENTS_AND_ALERT_CLUSTER_ID, 2818, "Appliance Events and Alert" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_SERVER) || defined(ZCL_USING_APPLIANCE_STATISTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER { ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER {ZCL_APPLIANCE_STATISTICS_CLUSTER_ID, 2819, "Appliance Statistics" },
 #else
-#define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_ELECTRICAL_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER { ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER {ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID, 2820, "Electrical Measurement" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_DIAGNOSTICS_CLUSTER_SERVER) || defined(ZCL_USING_DIAGNOSTICS_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER { ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER {ZCL_DIAGNOSTICS_CLUSTER_ID, 2821, "Diagnostics" },
 #else
-#define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
+    #define CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER
 #endif
 
 #if defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ZLL_COMMISSIONING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER { ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER {ZCL_ZLL_COMMISSIONING_CLUSTER_ID, 4096, "ZLL Commissioning" },
 #else
-#define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
+    #define CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER {ZCL_BINDING_CLUSTER_ID, 61440, "Binding" },
 #else
-#define CHIP_PRINTCLUSTER_BINDING_CLUSTER
+    #define CHIP_PRINTCLUSTER_BINDING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER {ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" },
 #else
-#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
+    #define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_ID, 64512, "Sample Mfg Specific Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_SERVER) || defined(ZCL_USING_SAMPLE_MFG_SPECIFIC_CLUSTER_2_CLIENT)
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                            \
-    { ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 {ZCL_SAMPLE_MFG_SPECIFIC_CLUSTER_2_ID, 64512, "Sample Mfg Specific Cluster 2" },
 #else
-#define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
+    #define CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2
 #endif
 
 #if defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_OTA_CONFIGURATION_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER { ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER {ZCL_OTA_CONFIGURATION_CLUSTER_ID, 64513, "Configuration Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
+    #define CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER
 #endif
 
 #if defined(ZCL_USING_MFGLIB_CLUSTER_SERVER) || defined(ZCL_USING_MFGLIB_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER { ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER {ZCL_MFGLIB_CLUSTER_ID, 64514, "MFGLIB Cluster" },
 #else
-#define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
+    #define CHIP_PRINTCLUSTER_MFGLIB_CLUSTER
 #endif
 
 #if defined(ZCL_USING_SL_WWAH_CLUSTER_SERVER) || defined(ZCL_USING_SL_WWAH_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER { ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
-#else
-#define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-#endif
-
-#define CLUSTER_IDS_TO_NAMES                                                                                                       \
-    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_GROUPS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SCENES_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_ALARM_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_TIME_CLUSTER                                                                                                 \
-    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER                                                                                   \
-    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_PARTITION_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_BASIC_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER                                                                        \
-    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                            \
-    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                          \
-    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                               \
-    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                      \
-    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                             \
-    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER                                                                \
-    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER                                                  \
-    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                   \
-    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER                                                           \
-    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER                                                      \
-    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER                                                    \
-    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER                                                                       \
-    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER                                                                    \
-    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                  \
-    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER                                                       \
-    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                 \
-    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER                                                                     \
-    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER                                                                                     \
-    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER                                                                                        \
-    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER                                                                                       \
-    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER                                                                                \
-    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER                                                                              \
-    CHIP_PRINTCLUSTER_PRICE_CLUSTER                                                                                                \
-    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER                                                                         \
-    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER                                                                                      \
-    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER                                                                                            \
-    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER                                                                                           \
-    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_EVENTS_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER                                                                                         \
-    CHIP_PRINTCLUSTER_GAMING_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_CHATTING_CLUSTER                                                                                             \
-    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_BILLING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER                                                                             \
-    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER                                                                               \
-    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER                                                                                          \
-    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_BINDING_CLUSTER                                                                                              \
-    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER                                                                                 \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER                                                                                  \
-    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2                                                                                \
-    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER                                                                                    \
-    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER                                                                                               \
-    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
-
-#define MAX_CLUSTER_NAME_LENGTH 52
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER {ZCL_SL_WWAH_CLUSTER_ID, 64599, "SL Works With All Hubs" },
+#else
+    #define CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER
+#endif
+
+
+#define CLUSTER_IDS_TO_NAMES \
+    CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \
+    CHIP_PRINTCLUSTER_IDENTIFY_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUPS_CLUSTER \
+    CHIP_PRINTCLUSTER_SCENES_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \
+    CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_ALARM_CLUSTER \
+    CHIP_PRINTCLUSTER_TIME_CLUSTER \
+    CHIP_PRINTCLUSTER_RSSI_LOCATION_CLUSTER \
+    CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_PARTITION_CLUSTER \
+    CHIP_PRINTCLUSTER_OTA_BOOTLOAD_CLUSTER \
+    CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \
+    CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_GREEN_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEEPALIVE_CLUSTER \
+    CHIP_PRINTCLUSTER_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERAL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_NETWORK_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \
+    CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \
+    CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \
+    CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_DEHUMID_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \
+    CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ILLUM_LEVEL_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OCCUPANCY_SENSING_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HYDROGEN_SULPHIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_OZONE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FECAL_COLIFORM_AND_E_COLI_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_COPPER_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_LEAD_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ZONE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_ACE_CLUSTER \
+    CHIP_PRINTCLUSTER_IAS_WD_CLUSTER \
+    CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
+    CHIP_PRINTCLUSTER_TV_CHANNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_TARGET_NAVIGATOR_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_PLAYBACK_CLUSTER \
+    CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \
+    CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \
+    CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \
+    CHIP_PRINTCLUSTER_ACCOUNT_LOGIN_CLUSTER \
+    CHIP_PRINTCLUSTER_GENERIC_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_BACNET_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_11073_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_ISO7816_PROTOCOL_TUNNEL_CLUSTER \
+    CHIP_PRINTCLUSTER_PRICE_CLUSTER \
+    CHIP_PRINTCLUSTER_DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_SIMPLE_METERING_CLUSTER \
+    CHIP_PRINTCLUSTER_MESSAGING_CLUSTER \
+    CHIP_PRINTCLUSTER_TUNNELING_CLUSTER \
+    CHIP_PRINTCLUSTER_PREPAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_ENERGY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_CALENDAR_CLUSTER \
+    CHIP_PRINTCLUSTER_DEVICE_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_EVENTS_CLUSTER \
+    CHIP_PRINTCLUSTER_MDU_PAIRING_CLUSTER \
+    CHIP_PRINTCLUSTER_SUB_GHZ_CLUSTER \
+    CHIP_PRINTCLUSTER_KEY_ESTABLISHMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_INFORMATION_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_SHARING_CLUSTER \
+    CHIP_PRINTCLUSTER_GAMING_CLUSTER \
+    CHIP_PRINTCLUSTER_DATA_RATE_CONTROL_CLUSTER \
+    CHIP_PRINTCLUSTER_VOICE_OVER_ZIGBEE_CLUSTER \
+    CHIP_PRINTCLUSTER_CHATTING_CLUSTER \
+    CHIP_PRINTCLUSTER_PAYMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_BILLING_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \
+    CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_DIAGNOSTICS_CLUSTER \
+    CHIP_PRINTCLUSTER_ZLL_COMMISSIONING_CLUSTER \
+    CHIP_PRINTCLUSTER_BINDING_CLUSTER \
+    CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER \
+    CHIP_PRINTCLUSTER_SAMPLE_MFG_SPECIFIC_CLUSTER_2 \
+    CHIP_PRINTCLUSTER_OTA_CONFIGURATION_CLUSTER \
+    CHIP_PRINTCLUSTER_MFGLIB_CLUSTER \
+    CHIP_PRINTCLUSTER_SL_WWAH_CLUSTER \
+
+#define MAX_CLUSTER_NAME_LENGTH  52